sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.3.2' into release-0.3.2

This commit is contained in:
Nick Mathewson 2018-03-13 13:42:06 +01:00
parent 2d42648eaf 094294dbb1
commit 4a03851e42
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug25474 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (compilation):
- Fix a c99 compliance issue in our configuration script that was
causing compilation issues when compiling Tor with certain
versions of xtools. Fixes bug 25474; bugfix on 0.3.2.5-alpha.

3
configure.ac
View File

@ -631,7 +631,8 @@ TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $STATIC_LIBEVENT_FLAGS $T
#include <winsock2.h>
#endif
struct event_base;
struct event_base *event_base_new(void);],
struct event_base *event_base_new(void);
void event_base_free(struct event_base *);],
[
#ifdef _WIN32
{WSADATA d; WSAStartup(0x101,&d); }