Merge remote-tracking branch 'purple/openssl' into meshnet

This commit is contained in:
Jeff Becker 2016-06-28 09:34:38 -04:00
commit 43be363542
No known key found for this signature in database
GPG key ID: AB950234D6EA286B
32 changed files with 486 additions and 382 deletions

View file

@ -12,6 +12,7 @@ include filelist.mk
USE_AESNI := yes
USE_STATIC := no
USE_MESHNET := yes
USE_UPNP := no
ifeq ($(UNAME),Darwin)
DAEMON_SRC += DaemonLinux.cpp