September 2017 - tor-commits - lists.torproject.org

[webwml/master] Bump alpha version to 0.3.1.6-rc
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit 88b17d9e069ab2bc704e08809777896b4d41b473 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 5 10:12:58 2017 -0400 Bump alpha version to 0.3.1.6-rc --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 56452394..584ad168 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # website component, and set it to needs_review. export STABLETAG=tor-0.3.0.10 -export DEVTAG=tor-0.3.1.5-alpha +export DEVTAG=tor-0.3.1.6-rc WMLBASE=. diff --git a/include/versions.wmi b/include/versions.wmi index 6e11eba7..1740e025 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.3.0.10</define-tag> -<define-tag version-alpha whitespace=delete>0.3.1.5-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.3.1.6-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.3.0.10</define-tag>

1 0

[tor/maint-0.3.1] test: Fix memory leak in hs_descriptor/decode_bad_signature
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit 7eaf055b280cd324507fa55758148dfee62657b1 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Aug 24 16:21:44 2017 -0400 test: Fix memory leak in hs_descriptor/decode_bad_signature Fixes #23319 Cherry-picked from master; bug not in any released Tor. --- src/or/hs_descriptor.c | 2 +- src/or/hs_descriptor.h | 2 ++ src/test/test_hs_descriptor.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index 616d2f280..fae527b2d 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -167,7 +167,7 @@ desc_intro_point_free(hs_desc_intro_point_t *ip) } /* Free the content of the plaintext section of a descriptor. */ -static void +STATIC void desc_plaintext_data_free_contents(hs_desc_plaintext_data_t *desc) { if (!desc) { diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h index b8b94792d..136477ae3 100644 --- a/src/or/hs_descriptor.h +++ b/src/or/hs_descriptor.h @@ -235,6 +235,8 @@ STATIC int desc_sig_is_valid(const char *b64_sig, STATIC void desc_intro_point_free(hs_desc_intro_point_t *ip); STATIC size_t decode_superencrypted(const char *message, size_t message_len, uint8_t **encrypted_out); +STATIC void desc_plaintext_data_free_contents(hs_desc_plaintext_data_t *desc); + #endif /* HS_DESCRIPTOR_PRIVATE */ #endif /* TOR_HS_DESCRIPTOR_H */ diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index 8f8da361d..7d7ec7d9d 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -574,7 +574,8 @@ test_decode_bad_signature(void *arg) expect_log_msg_containing("Malformed signature line. Rejecting."); teardown_capture_of_logs(); - done: ; + done: + desc_plaintext_data_free_contents(&desc_plaintext); } static void

1 0

[tor/release-0.3.1] test: Fix memory leak in hs_descriptor/decode_bad_signature
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit 7eaf055b280cd324507fa55758148dfee62657b1 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Aug 24 16:21:44 2017 -0400 test: Fix memory leak in hs_descriptor/decode_bad_signature Fixes #23319 Cherry-picked from master; bug not in any released Tor. --- src/or/hs_descriptor.c | 2 +- src/or/hs_descriptor.h | 2 ++ src/test/test_hs_descriptor.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index 616d2f280..fae527b2d 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -167,7 +167,7 @@ desc_intro_point_free(hs_desc_intro_point_t *ip) } /* Free the content of the plaintext section of a descriptor. */ -static void +STATIC void desc_plaintext_data_free_contents(hs_desc_plaintext_data_t *desc) { if (!desc) { diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h index b8b94792d..136477ae3 100644 --- a/src/or/hs_descriptor.h +++ b/src/or/hs_descriptor.h @@ -235,6 +235,8 @@ STATIC int desc_sig_is_valid(const char *b64_sig, STATIC void desc_intro_point_free(hs_desc_intro_point_t *ip); STATIC size_t decode_superencrypted(const char *message, size_t message_len, uint8_t **encrypted_out); +STATIC void desc_plaintext_data_free_contents(hs_desc_plaintext_data_t *desc); + #endif /* HS_DESCRIPTOR_PRIVATE */ #endif /* TOR_HS_DESCRIPTOR_H */ diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index 8f8da361d..7d7ec7d9d 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -574,7 +574,8 @@ test_decode_bad_signature(void *arg) expect_log_msg_containing("Malformed signature line. Rejecting."); teardown_capture_of_logs(); - done: ; + done: + desc_plaintext_data_free_contents(&desc_plaintext); } static void

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit 73d7526fb42edbadd03770ba8fdcbf7bb962a1e4 Merge: e58f11077 7eaf055b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 5 09:26:39 2017 -0400 Merge branch 'maint-0.3.1'

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit cf0124b2389431f36f5781a6e7f3181d0590ab0f Merge: b9c29105f 7eaf055b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 5 09:26:39 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/or/hs_descriptor.c | 2 +- src/or/hs_descriptor.h | 2 ++ src/test/test_hs_descriptor.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] test: Fix memory leak in hs_descriptor/decode_bad_signature
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit 7eaf055b280cd324507fa55758148dfee62657b1 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Aug 24 16:21:44 2017 -0400 test: Fix memory leak in hs_descriptor/decode_bad_signature Fixes #23319 Cherry-picked from master; bug not in any released Tor. --- src/or/hs_descriptor.c | 2 +- src/or/hs_descriptor.h | 2 ++ src/test/test_hs_descriptor.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index 616d2f280..fae527b2d 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -167,7 +167,7 @@ desc_intro_point_free(hs_desc_intro_point_t *ip) } /* Free the content of the plaintext section of a descriptor. */ -static void +STATIC void desc_plaintext_data_free_contents(hs_desc_plaintext_data_t *desc) { if (!desc) { diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h index b8b94792d..136477ae3 100644 --- a/src/or/hs_descriptor.h +++ b/src/or/hs_descriptor.h @@ -235,6 +235,8 @@ STATIC int desc_sig_is_valid(const char *b64_sig, STATIC void desc_intro_point_free(hs_desc_intro_point_t *ip); STATIC size_t decode_superencrypted(const char *message, size_t message_len, uint8_t **encrypted_out); +STATIC void desc_plaintext_data_free_contents(hs_desc_plaintext_data_t *desc); + #endif /* HS_DESCRIPTOR_PRIVATE */ #endif /* TOR_HS_DESCRIPTOR_H */ diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index 8f8da361d..7d7ec7d9d 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -574,7 +574,8 @@ test_decode_bad_signature(void *arg) expect_log_msg_containing("Malformed signature line. Rejecting."); teardown_capture_of_logs(); - done: ; + done: + desc_plaintext_data_free_contents(&desc_plaintext); } static void

1 0

[tor/release-0.3.1] Edit changelog.
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit efc306c59aa9ee1a32d1979df731f25904852709 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 5 09:27:41 2017 -0400 Edit changelog. --- ChangeLog | 60 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 816844a0e..b67742876 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,51 +1,53 @@ Changes in version 0.3.1.6-rc - 2017-09-05 Tor 0.3.1.6-rc fixes a few small bugs and annoyances in the 0.3.1 - release series. + release series, including a bug that produced weird behavior on + Windows directory caches. This is the first release candidate in the Tor 0.3.1 series. If we find no new bugs or regressions here, the first stable 0.3.1 release will be nearly identical to it. o Major bugfixes (windows, directory cache): - - On windows, do not try to delete cached consensus documents and - diffs, until they unmapped from memory. Allow the diff storage - directory to grow larger in order to handle files that might need - to stay around longer. Fixes bug 22752; bugfix on 0.3.1.1-alpha. + - On Windows, do not try to delete cached consensus documents and + diffs before they are unmapped from memory--Windows won't allow + that. Instead, allow the consensus cache directory to grow larger, + to hold files that might need to stay around longer. Fixes bug + 22752; bugfix on 0.3.1.1-alpha. o Minor features (directory authority): - - Improve the message that authorities report to relays when the - RSA/Ed25519 key pair they present conflicts with a previously - pinned key. Closes ticket 22348. + - Improve the message that authorities report to relays that present + RSA/Ed25519 keypairs that conflict with previously pinned keys. + Closes ticket 22348. o Minor features (geoip): - Update geoip and geoip6 to the August 3 2017 Maxmind GeoLite2 Country database. o Minor features (testing): - - Add a couple more tests for compression backend initialization. - Closes ticket 22286. + - Add more tests for compression backend initialization. Closes + ticket 22286. o Minor bugfixes (directory cache): - - Fix a memory leak in the code that recovers space in the consensus - directory cache. Fixes bug 23139; bugfix on 0.3.1.1-alpha. + - Fix a memory leak when recovering space in the consensus cache. + Fixes bug 23139; bugfix on 0.3.1.1-alpha. o Minor bugfixes (hidden service): - - A service is allowed to open a maximum number of circuits for a - specific period of time. That value was lower than it should be (8 - vs 12) in the normal case of 3 introduction points. Fixes bug - 22159; bugfix on 0.3.0.5-rc. - - Fix a BUG alert during HSv3 descriptor decoding that could trigger - with a specially crafted descriptor. Fixes bug 23233; bugfix on - 0.3.0.1-alpha. Bug found by "haxxpop". - - Rate limit the log if we ever go above the maximum number of + - Increase the number of circuits that a service is allowed to + open over a specific period of time. The value was lower than it + should be (8 vs 12) in the normal case of 3 introduction points. + Fixes bug 22159; bugfix on 0.3.0.5-rc. + - Fix a BUG warning during HSv3 descriptor decoding that could be + cause by a specially crafted descriptor. Fixes bug 23233; bugfix + on 0.3.0.1-alpha. Bug found by "haxxpop". + - Rate-limit the log messages if we exceed the maximum number of allowed intro circuits. Fixes bug 22159; bugfix on 0.3.1.1-alpha. o Minor bugfixes (logging, relay): - - Remove a log_warn() that has been forgotten when an introduction - point successfully established a hidden service prop224 circuit - with a client. - - Three other log_warn() for an introduction point have been changed - to protocol warning because they can be failure from the network + - Remove a forgotten debugging message when an introduction point + successfully establishes a hidden service prop224 circuit with + a client. + - Change three other log_warn() for an introduction point to + protocol warnings, because they can be failure from the network and are not relevant to the operator. Fixes bug 23078; bugfix on 0.3.0.1-alpha and 0.3.0.2-alpha. @@ -58,12 +60,12 @@ Changes in version 0.3.1.6-rc - 2017-09-05 o Minor bugfixes (robustness, error handling): - Improve our handling of the cases where OpenSSL encounters a memory error while encoding keys and certificates. We haven't - observed these happening in the wild, but if they do happen, we - now detect and respond better. Fixes bug 19418; bugfix on all - versions of Tor. Reported by Guido Vranken. + observed these errors in the wild, but if they do happen, we now + detect and respond better. Fixes bug 19418; bugfix on all versions + of Tor. Reported by Guido Vranken. o Minor bugfixes (stability): - - Avoid crashing on double-free when unable to load or process an + - Avoid crashing on a double-free when unable to load or process an included file. Fixes bug 23155; bugfix on 0.3.1.1-alpha. Found with the clang static analyzer.

1 0

[tor/maint-0.3.1] Bump version to 0.3.1.6-rc
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit 2d55620a9eac89cd1dd43250899119485b505a15 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 5 08:30:52 2017 -0400 Bump version to 0.3.1.6-rc --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index a7cf8f739..33f74da55 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.1.5-alpha-dev]) +AC_INIT([tor],[0.3.1.6-rc]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 45b2db816..d35b5c682 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.1.5-alpha-dev" +!define VERSION "0.3.1.6-rc" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index fc52ca3a1..1f6373e00 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.1.5-alpha-dev" +#define VERSION "0.3.1.6-rc"

1 0

[tor/release-0.3.1] Fold two more entries into 0.3.1.6-rc changelog
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit bebf7eb54e0852eeefa4b8608354ab75f912050b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 5 08:29:54 2017 -0400 Fold two more entries into 0.3.1.6-rc changelog --- ChangeLog | 14 +++++++++++++- changes/bug22752_simple | 6 ------ changes/bug23275 | 5 ----- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ff71b123..816844a0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.3.1.6-rc - 2017-0?-?? +Changes in version 0.3.1.6-rc - 2017-09-05 Tor 0.3.1.6-rc fixes a few small bugs and annoyances in the 0.3.1 release series. @@ -6,6 +6,12 @@ Changes in version 0.3.1.6-rc - 2017-0?-?? find no new bugs or regressions here, the first stable 0.3.1 release will be nearly identical to it. + o Major bugfixes (windows, directory cache): + - On windows, do not try to delete cached consensus documents and + diffs, until they unmapped from memory. Allow the diff storage + directory to grow larger in order to handle files that might need + to stay around longer. Fixes bug 22752; bugfix on 0.3.1.1-alpha. + o Minor features (directory authority): - Improve the message that authorities report to relays when the RSA/Ed25519 key pair they present conflicts with a previously @@ -43,6 +49,12 @@ Changes in version 0.3.1.6-rc - 2017-0?-?? and are not relevant to the operator. Fixes bug 23078; bugfix on 0.3.0.1-alpha and 0.3.0.2-alpha. + o Minor bugfixes (relay): + - When a relay is not running as a directory cache, it will no + longer generate compressed consensuses and consensus diff + information. Previously, this was a waste of disk and CPU. Fixes + bug 23275; bugfix on 0.3.1.1-alpha. + o Minor bugfixes (robustness, error handling): - Improve our handling of the cases where OpenSSL encounters a memory error while encoding keys and certificates. We haven't diff --git a/changes/bug22752_simple b/changes/bug22752_simple deleted file mode 100644 index 7e6035705..000000000 --- a/changes/bug22752_simple +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes (windows, directory cache): - - On windows, do not try to delete cached consensus documents and - diffs, until they unmapped from memory. Allow the diff storage - directory to grow larger in order to handle files that might - need to stay around longer. Fixes bug 22752; bugfix on - 0.3.1.1-alpha. diff --git a/changes/bug23275 b/changes/bug23275 deleted file mode 100644 index d6c3c4774..000000000 --- a/changes/bug23275 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (relay): - - When a relay is not running as a directory cache, it will no longer - generate compressed consensuses and consensus diff information. - Previously, this was a waste of disk and CPU. Fixes bug 23275; - bugfix on 0.3.1.1-alpha.

1 0

[tor/release-0.3.1] Bump version to 0.3.1.6-rc
by nickm＠torproject.org 05 Sep '17

05 Sep '17

commit 2d55620a9eac89cd1dd43250899119485b505a15 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 5 08:30:52 2017 -0400 Bump version to 0.3.1.6-rc --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index a7cf8f739..33f74da55 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.1.5-alpha-dev]) +AC_INIT([tor],[0.3.1.6-rc]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 45b2db816..d35b5c682 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.1.5-alpha-dev" +!define VERSION "0.3.1.6-rc" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index fc52ca3a1..1f6373e00 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.1.5-alpha-dev" +#define VERSION "0.3.1.6-rc"

1 0