diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-03-13 13:41:33 +0100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-03-13 13:41:33 +0100 |
| commit | 1047ef140e62a47d3d4019f6c30654ea9ef65954 (patch) | |
| tree | 8431c9b861b818ba893045b883a0238a8fc93154 | |
| parent | 40154c1f9eeb378f5aac11c23ed26215ddfc26f3 (diff) | |
| parent | 676a28599dcc3854a98c684808055db76dcd265b (diff) | |
| download | tor-1047ef140e62a47d3d4019f6c30654ea9ef65954.tar.gz tor-1047ef140e62a47d3d4019f6c30654ea9ef65954.zip | |
Merge branch 'maint-0.3.3'
| -rw-r--r-- | changes/bug25474 | 5 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug25474 b/changes/bug25474 new file mode 100644 index 0000000000..7d3bd1c5f5 --- /dev/null +++ b/changes/bug25474 @@ -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. + diff --git a/configure.ac b/configure.ac index 22c8a56137..0b9733cdb9 100644 --- a/configure.ac +++ b/configure.ac @@ -681,7 +681,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); } |