March 2018 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 1047ef140e62a47d3d4019f6c30654ea9ef65954 Merge: 40154c1f9 676a28599 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 13:41:33 2018 +0100 Merge branch 'maint-0.3.3' changes/bug25474 | 5 +++++ configure.ac | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'bug25474_032' into maint-0.3.2
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 094294dbb1e631d9b11ee8dbc3f70ccb9f290c54 Merge: 0026d1a67 53a807e1e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 13:41:11 2018 +0100 Merge branch 'bug25474_032' into maint-0.3.2 changes/bug25474 | 5 +++++ configure.ac | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 676a28599dcc3854a98c684808055db76dcd265b Merge: e9dbd6dd8 094294dbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 13:41:24 2018 +0100 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25474 | 5 +++++ configure.ac | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.3] Merge branch 'bug25474_032' into maint-0.3.2
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 094294dbb1e631d9b11ee8dbc3f70ccb9f290c54 Merge: 0026d1a67 53a807e1e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 13:41:11 2018 +0100 Merge branch 'bug25474_032' into maint-0.3.2 changes/bug25474 | 5 +++++ configure.ac | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/master] Add a missing prototype to our libevent configure stanza.
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 53a807e1e94e01bf3ea7e90d1203b952eee929b0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 13:37:26 2018 +0100 Add a missing prototype to our libevent configure stanza. Fixes bug 25474; bugfix on 0.3.2.5-alpha. --- changes/bug25474 | 5 +++++ configure.ac | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug25474 b/changes/bug25474 new file mode 100644 index 000000000..7d3bd1c5f --- /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 5a74d6c61..b5cacd06a 100644 --- a/configure.ac +++ b/configure.ac @@ -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); }

1 0

[tor/release-0.3.2] Merge branch 'bug25474_032' into maint-0.3.2
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 094294dbb1e631d9b11ee8dbc3f70ccb9f290c54 Merge: 0026d1a67 53a807e1e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 13:41:11 2018 +0100 Merge branch 'bug25474_032' into maint-0.3.2 changes/bug25474 | 5 +++++ configure.ac | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 4a03851e42afcb75525b4c4ca2331e75fb19fadf Merge: 2d42648ea 094294dbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 13:42:06 2018 +0100 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25474 | 5 +++++ configure.ac | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 676a28599dcc3854a98c684808055db76dcd265b Merge: e9dbd6dd8 094294dbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 13:41:24 2018 +0100 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25474 | 5 +++++ configure.ac | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Add a missing prototype to our libevent configure stanza.
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 53a807e1e94e01bf3ea7e90d1203b952eee929b0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 13:37:26 2018 +0100 Add a missing prototype to our libevent configure stanza. Fixes bug 25474; bugfix on 0.3.2.5-alpha. --- changes/bug25474 | 5 +++++ configure.ac | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug25474 b/changes/bug25474 new file mode 100644 index 000000000..7d3bd1c5f --- /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 5a74d6c61..b5cacd06a 100644 --- a/configure.ac +++ b/configure.ac @@ -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); }

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 13 Mar '18

13 Mar '18

commit 676a28599dcc3854a98c684808055db76dcd265b Merge: e9dbd6dd8 094294dbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 13 13:41:24 2018 +0100 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25474 | 5 +++++ configure.ac | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0