nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug26156_034'

Browse Source
This commit is contained in:
Nick Mathewson 2018-05-23 09:08:57 -04:00
commit 36a107855b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug26156 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (compilation):
- Fix compilation when building with OpenSSL 1.1.0 with the
"no-deprecated" flag enabled. Fixes bug 26156; bugfix on 0.3.4.1-alpha.

1
src/common/aes.c
View File

@ -16,6 +16,7 @@
#include <ws2tcpip.h> #include <ws2tcpip.h>
#endif #endif
#include "compat_openssl.h"
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#include "crypto_openssl_mgt.h" #include "crypto_openssl_mgt.h"