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

[tor/master] Note that bw_accounting is obsoleted by values in the state file
by nickm＠torproject.org 20 Jun '17

20 Jun '17

commit c4152a25e354b3408570603c8481302bf986f65c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 20 14:18:10 2017 -0400 Note that bw_accounting is obsoleted by values in the state file Closes ticket 16082. --- changes/bug16082 | 4 ++++ doc/tor.1.txt | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/changes/bug16082 b/changes/bug16082 new file mode 100644 index 0000000..0f2f04f --- /dev/null +++ b/changes/bug16082 @@ -0,0 +1,4 @@ + o Documentation: + - Correctly note that bandwidth accounting values are stored in the + state file, and the bw_accounting file is now obsolete. Closes + ticket 16082. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ff9fba7..2459969 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2725,8 +2725,7 @@ __DataDirectory__**/state**:: A set of persistent key-value mappings. These are documented in the file. These include: - The current entry guards and their status. - - The current bandwidth accounting values (unused so far; see - below). + - The current bandwidth accounting values. - When the file was last written - What version of Tor generated the state file - A short history of bandwidth usage, as produced in the server @@ -2746,8 +2745,7 @@ __DataDirectory__**/diff-cache**:: __DataDirectory__**/bw_accounting**:: Used to track bandwidth accounting values (when the current period starts and ends; how much has been read and written so far this period). This file - is obsolete, and the data is now stored in the \'state' file as well. Only - used when bandwidth accounting is enabled. + is obsolete, and the data is now stored in the \'state' file instead. __DataDirectory__**/control_auth_cookie**:: Used for cookie authentication with the controller. Location can be

1 0

[tor/maint-0.3.1] Note that pkgconfig is now needed, and has been for a few releases.
by nickm＠torproject.org 20 Jun '17

20 Jun '17

commit fecc66d1e6cadc607800e7929fa490ac0c428e20 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 20 13:54:30 2017 -0400 Note that pkgconfig is now needed, and has been for a few releases. --- changes/new_requirement_pkgconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/new_requirement_pkgconfig b/changes/new_requirement_pkgconfig new file mode 100644 index 0000000..503ff58 --- /dev/null +++ b/changes/new_requirement_pkgconfig @@ -0,0 +1,5 @@ + o New dependencies: + - To build with zstd and lzma support, Tor now requires the + pkg-config tool at build time. (This requirement was new in + 0.3.1.1-alpha, but was not noted at the time. Noting it here to + close ticket 22623.)

1 0

[tor/master] Note that pkgconfig is now needed, and has been for a few releases.
by nickm＠torproject.org 20 Jun '17

20 Jun '17

commit fecc66d1e6cadc607800e7929fa490ac0c428e20 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 20 13:54:30 2017 -0400 Note that pkgconfig is now needed, and has been for a few releases. --- changes/new_requirement_pkgconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/new_requirement_pkgconfig b/changes/new_requirement_pkgconfig new file mode 100644 index 0000000..503ff58 --- /dev/null +++ b/changes/new_requirement_pkgconfig @@ -0,0 +1,5 @@ + o New dependencies: + - To build with zstd and lzma support, Tor now requires the + pkg-config tool at build time. (This requirement was new in + 0.3.1.1-alpha, but was not noted at the time. Noting it here to + close ticket 22623.)

1 0

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

20 Jun '17

commit fa2bd196b40504e0fd20c58574d6911aef19a68e Merge: a9a76aa fecc66d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 20 13:54:35 2017 -0400 Merge branch 'maint-0.3.1' changes/new_requirement_pkgconfig | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[tor/release-0.3.1] Note that pkgconfig is now needed, and has been for a few releases.
by nickm＠torproject.org 20 Jun '17

20 Jun '17

commit fecc66d1e6cadc607800e7929fa490ac0c428e20 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 20 13:54:30 2017 -0400 Note that pkgconfig is now needed, and has been for a few releases. --- changes/new_requirement_pkgconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/new_requirement_pkgconfig b/changes/new_requirement_pkgconfig new file mode 100644 index 0000000..503ff58 --- /dev/null +++ b/changes/new_requirement_pkgconfig @@ -0,0 +1,5 @@ + o New dependencies: + - To build with zstd and lzma support, Tor now requires the + pkg-config tool at build time. (This requirement was new in + 0.3.1.1-alpha, but was not noted at the time. Noting it here to + close ticket 22623.)

1 0

[torspec/master] Correct the description of PT_SERVER_TRANSPORT_OPTIONS in pt-spec.txt
by nickm＠torproject.org 20 Jun '17

20 Jun '17

commit 86480728d816474a0771a3b3aba5d223a32f0705 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 16 14:16:51 2017 -0400 Correct the description of PT_SERVER_TRANSPORT_OPTIONS in pt-spec.txt --- pt-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt-spec.txt b/pt-spec.txt index aa723aa..e94d480 100644 --- a/pt-spec.txt +++ b/pt-spec.txt @@ -279,7 +279,7 @@ Table of Contents is a PT name and <value> is a k=v string value with options that are to be passed to the transport. - Colons, semicolons, equal signs and backslashes MUST be + Colons, semicolons, and backslashes MUST be escaped with a backslash. If there are no arguments that need to be passed to any of

1 0

[tor/master] Fix compress_none.c header comment
by nickm＠torproject.org 20 Jun '17

20 Jun '17

commit 25edb41e6fd00ea902dab40c997dbce8b49eb884 Author: Taylor Yu <catalyst(a)torproject.org> Date: Tue Jun 20 11:23:31 2017 -0400 Fix compress_none.c header comment The Doxygen \file markup for compress_none.c had the wrong filename. Fixes #22638. --- src/common/compress_none.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/compress_none.c b/src/common/compress_none.c index b76e601..34314e4 100644 --- a/src/common/compress_none.c +++ b/src/common/compress_none.c @@ -4,7 +4,7 @@ /* See LICENSE for licensing information */ /** - * \file compress_lzma.c + * \file compress_none.c * \brief Compression backend for identity compression. * * We actually define this backend so that we can treat the identity transform

1 0

[tor/master] Merge remote-tracking branch 'argonblue/bug22638' into maint-0.3.1
by nickm＠torproject.org 20 Jun '17

20 Jun '17

commit 392e5457b86fdaeae5d15ead5ff75f021c730549 Merge: 9452561 25edb41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 20 13:35:38 2017 -0400 Merge remote-tracking branch 'argonblue/bug22638' into maint-0.3.1 src/common/compress_none.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] mingw/windows printf lacks %zd ; use %lu and casts instead
by nickm＠torproject.org 20 Jun '17

20 Jun '17

commit 945256188ab3a9b5842455f714d51e1871b0bf69 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 20 12:12:55 2017 -0400 mingw/windows printf lacks %zd ; use %lu and casts instead (This approach can lose accuracy, but it's only in debug-level messages.) Fixes windows compilation. Bugfix on recent compress.c changes; bug not in any released Tor. --- src/common/compress.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/compress.c b/src/common/compress.c index e65894d..c16d1b5 100644 --- a/src/common/compress.c +++ b/src/common/compress.c @@ -105,8 +105,8 @@ tor_compress_impl(int compress, if (stream == NULL) { log_warn(LD_GENERAL, "NULL stream while %scompressing", compress?"":"de"); - log_debug(LD_GENERAL, "method: %d level: %d at len: %zd", - method, compression_level, in_len); + log_debug(LD_GENERAL, "method: %d level: %d at len: %lu", + method, compression_level, (unsigned long)in_len); return -1; } @@ -146,15 +146,15 @@ tor_compress_impl(int compress, "Unexpected %s while %scompressing", complete_only?"end of input":"result", compress?"":"de"); - log_debug(LD_GENERAL, "method: %d level: %d at len: %zd", - method, compression_level, in_len); + log_debug(LD_GENERAL, "method: %d level: %d at len: %lu", + method, compression_level, (unsigned long)in_len); goto err; } else { if (in_len != 0) { log_fn(protocol_warn_level, LD_PROTOCOL, "Unexpected extra input while decompressing"); - log_debug(LD_GENERAL, "method: %d level: %d at len: %zd", - method, compression_level, in_len); + log_debug(LD_GENERAL, "method: %d level: %d at len: %lu", + method, compression_level, (unsigned long)in_len); goto err; } else { goto done;

1 0

[tor/maint-0.3.1] Merge remote-tracking branch 'argonblue/bug22638' into maint-0.3.1
by nickm＠torproject.org 20 Jun '17

20 Jun '17

commit 392e5457b86fdaeae5d15ead5ff75f021c730549 Merge: 9452561 25edb41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 20 13:35:38 2017 -0400 Merge remote-tracking branch 'argonblue/bug22638' into maint-0.3.1 src/common/compress_none.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0