Revert "Merge branch 'master' into master"

This reverts commit 0f5b6deb5e, reversing
changes made to eb21e9d572.

.travis.yml

@@ -1,50 +0,0 @@
-dist: trusty
-sudo: required
-
-language: c
-cache: ccache
-git:
-    submodules: false
-
-before_install:
-    - if [ -n "$COVERALLS" ]; then
-          pip install --user cpp-coveralls;
-      fi;
-    - if expr "$CONFIG_OPTS" ":" ".*enable-external-tests" > /dev/null; then
-          git submodule update --init --recursive;
-      fi;
-
-addons:
-    apt:
-        packages:
-            - ccache
-            - golang-1.6
-
-os:
-    - linux
-
-compiler:
-    - clang
-    - gcc
-
-env:
-    - CONFIG_OPTS="no-paillier" DESTDIR="_install" 
-
-before_script:
-    - env
-    - pwd
-    - ls -l
-    - ./config -v $CONFIG_OPTS;
-
-script:
-    - if [ -z "$BUILDONLY" ]; then
-          make="make -s";
-      else
-          make="make";
-      fi
-    - $make update
-    - $make
-    - $make test
-    - $make install
-
-

util/libcrypto.num

@@ -4928,4 +4928,4 @@ SM2CiphertextValue_new_from_ECCCipher   4872	1_1_0d	EXIST::FUNCTION:
 SM2CiphertextValue_set_ECCCipher        4873	1_1_0d	EXIST::FUNCTION:
 SM2CiphertextValue_get_ECCCIPHERBLOB    4874	1_1_0d	EXIST::FUNCTION:
 ECIES_PARAMS_init_with_type             4875	1_1_0d	EXIST::FUNCTION:
-BN_GFP2_one                             4876	1_1_0d	EXIST::FUNCTION:
+BN_GFP2_one                             4876	1_1_0d	EXIST::FUNCTION: