February 2020 - tor-commits - lists.torproject.org

[tor/master] start on 0.4.3.2-alpha changelog
by nickm＠torproject.org 10 Feb '20

10 Feb '20

commit a0ca442b79306eaa9907ad069be85a9d4b640f7d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 14:30:36 2020 -0500 start on 0.4.3.2-alpha changelog --- ChangeLog | 82 ++++++++++++++++++++++++++++++++++++++++++++++++ changes/bug32673 | 5 --- changes/bug33005 | 3 -- changes/bug33093_logging | 5 --- changes/bug33095_041 | 5 --- changes/bug33104 | 4 --- changes/ticket32230 | 3 -- changes/ticket32372 | 4 --- changes/ticket32455 | 2 -- changes/ticket32706 | 4 --- changes/ticket32928 | 7 ----- changes/ticket33039 | 3 -- changes/ticket33075 | 4 --- changes/ticket33091 | 3 -- changes/ticket33103 | 3 -- changes/ticket33139 | 3 -- changes/ticket33148 | 5 --- changes/ticket33212 | 4 --- 18 files changed, 82 insertions(+), 67 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d05bea86..e4779a900 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,85 @@ +Changes in version 0.4.3.2-alpha - 2020-02-10 + This is the second stable alpha release in the Tor 0.4.3.x series. It + fixes several bugs present in the previous alpha release. Anybody + running the previous alpha should upgrade, and look for bugs in this + one instead. + + o Major bugfixes (Onion service client, authorization): + - On a NEWNYM signal, purge the ephemeral client authorization + cache. The permanent ones are kept. Fixes bug 33139; bugfix + on 0.4.3.1-alpha. + + o Minor features (best practices tracker): + - Practracker now supports a --regen-overbroad option to regenerate + the exceptions file, but only to revise exceptions to be _less_ + tolerant of best-practices violations. Closes ticket 32372. + + o Minor features (continuous integration): + - Run Doxygen Makefile target on Travis. Closes ticket 32455. + - Stop allowing failures on the Travis CI stem tests job. It looks + like all the stem hangs we were seeing before are now fixed. + Closes ticket 33075. + + o Minor bugfixes (build system): + - Some configure options were either missing or incorrect in the + configure summary. Fixes bug 32230; bugfix on 0.4.3.1-alpha. + + o Minor bugfixes (controller protocol): + - Fix a memory leak introduced by refactoring of control reply + formatting code. Fixes bug 33039; bugfix on 0.4.3.1-alpha. + - Fix a memory leak in GETINFO responses. Fixes bug 33103; bugfix + on 0.4.3.1-alpha. + - When receiving "ACTIVE" or "DORMANT" signals on the control port, + report them as SIGNAL events. Fixes bug 33104; bugfix + on 0.4.0.1-alpha. + + o Minor bugfixes (logging): + - If we encounter a bug when flushing a buffer to a TLS connection, + only log the bug once per invocation of the Tor process. + Previously we would log with every occurrence, which could cause + us to run out of disk space. Fixes bug 33093; bugfix + on 0.3.2.2-alpha. + - When logging a bug, do not say "Future instances of this warning + will be silenced" unless we are actually going to do so. + Previously we would say this whenever a BUG() check failed in the + code. Fixes bug 33095; bugfix on 0.4.1.1-alpha. + + o Minor bugfixes (onion service v2): + - Move a series of warnings to protocol warning level because they + can all be triggered remotely by a malformed request. Fixes bug + 32706; bugfix on 0.1.1.14-alpha. + + o Minor bugfixes (onion service v3, client authorization): + - When removing client authorization credentials using the control + port, also remove the associated descriptor so they don't linger + and are still usable hence making the onion service behind client + authorization reachable. Fixes bug 33148; bugfix on 0.4.3.1-alpha. + + o Minor bugfixes (pluggable transports): + - Lower the log level of standard error messages from a PT from + warning to info. Fixes bug 33005; bugfix on 0.4.0.1-alpha. + + o Minor bugfixes (rust, build): + - Fix a syntax warning given by newer versions of Rust, and creating + problems for our continuous integration. Fixes bug 33212; bugfix + on 0.3.5.1-alpha. + + o Minor bugfixes (TLS bug handling): + - When encountering a bug in buf_read_freom_tls(), return a "MISC" + error code rather than "WANTWRITE". This change might help avoid + some CPU-wasting loops if the bug is ever triggered. Bug reported + by opara. Fixes bug 32673; bugfix on 0.3.0.4-alpha. + + o Code simplification and refactoring (mainloop): + - Simplify the ip_address_changed() function by removing redundant + checks. Closes ticket 33091. + + o Documentation (manpage): + - Split Circuit Timeout options and Node Selection options into + their own sections of the tor manpage. Closes tickets 32928 and + 32929. Work by Swati Thacker as part of Google Season of Docs. + + Changes in version 0.4.2.6 - 2020-01-30 This is the second stable release in the 0.4.2.x series. It backports several bugfixes from 0.4.3.1-alpha, including some that had affected diff --git a/changes/bug32673 b/changes/bug32673 deleted file mode 100644 index 32f02c639..000000000 --- a/changes/bug32673 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (TLS bug handling): - - When encountering a bug in buf_read_freom_tls(), return a - "MISC" error code rather than "WANTWRITE". This change might - help avoid some CPU-wasting loops if the bug is ever triggered. - Bug reported by opara. Fixes bug 32673; bugfix on 0.3.0.4-alpha. diff --git a/changes/bug33005 b/changes/bug33005 deleted file mode 100644 index 30a8d01bb..000000000 --- a/changes/bug33005 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (pluggable transports): - - Lower the log level of standard error messages from a PT from warning to - info. Fixes bug 33005; bugfix on 0.4.0.1-alpha. diff --git a/changes/bug33093_logging b/changes/bug33093_logging deleted file mode 100644 index e26e4a64a..000000000 --- a/changes/bug33093_logging +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (logging): - - If we encounter a bug when flushing a buffer to a TLS connection, - only log the bug once per invocation of the Tor process. Previously we - would log with every occurrence, which could cause us to run out of - disk space. Fixes bug 33093; bugfix on 0.3.2.2-alpha. diff --git a/changes/bug33095_041 b/changes/bug33095_041 deleted file mode 100644 index 7d1f04e27..000000000 --- a/changes/bug33095_041 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (logging, bug reporting): - - When logging a bug, do not say "Future instances of this warning - will be silenced" unless we are actually going to do - so. Previously we would say this whenever a BUG() check failed in - the code. Fixes bug 33095; bugfix on 0.4.1.1-alpha. diff --git a/changes/bug33104 b/changes/bug33104 deleted file mode 100644 index b5478df10..000000000 --- a/changes/bug33104 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (controller): - - When receiving "ACTIVE" or "DORMANT" signals on the control port, - report them as SIGNAL events. Fixes bug 33104; bugfix on - 0.4.0.1-alpha. diff --git a/changes/ticket32230 b/changes/ticket32230 deleted file mode 100644 index 781ba8087..000000000 --- a/changes/ticket32230 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (build system): - - Some configure options were either missing or incorrect in the configure - summary. Fixes bug 32230; bugfix on 0.4.3.1-alpha. diff --git a/changes/ticket32372 b/changes/ticket32372 deleted file mode 100644 index ed2d38b40..000000000 --- a/changes/ticket32372 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (best practices tracker): - - Practracker now supports a --regen-overbroad option to regenerate - the exceptions file, but only to revise exceptions to be _less_ - tolerant of best-practices violations. Closes ticket 32372. diff --git a/changes/ticket32455 b/changes/ticket32455 deleted file mode 100644 index 3fa3b3e98..000000000 --- a/changes/ticket32455 +++ /dev/null @@ -1,2 +0,0 @@ - o Minor features (continuous integration): - - Run Doxygen Makefile target on Travis. Closes ticket 32455. diff --git a/changes/ticket32706 b/changes/ticket32706 deleted file mode 100644 index d330decf3..000000000 --- a/changes/ticket32706 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (onion service v2): - - Move a series of warnings to protocol warning level because they can all - be triggered remotely by a malformed request. Fixes bug 32706; bugfix on - 0.1.1.14-alpha. diff --git a/changes/ticket32928 b/changes/ticket32928 deleted file mode 100644 index f7739e928..000000000 --- a/changes/ticket32928 +++ /dev/null @@ -1,7 +0,0 @@ - o Documentation (manpage): - - Split Circuit Timeout options into their own section of the tor - manpage. Closes ticket 32928. Work by Swati Thacker as part of - Google Season of Docs. - - Split Node selection options into their own section of the tor - manpage. Closes ticket 32929. Work by Swati Thacker as part of - Google Season of Docs. diff --git a/changes/ticket33039 b/changes/ticket33039 deleted file mode 100644 index 29eeabf45..000000000 --- a/changes/ticket33039 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (control port): - - Fix a memory leak introduced by refactoring of control reply - formatting code. Fixes bug 33039; bugfix on 0.4.3.1-alpha. diff --git a/changes/ticket33075 b/changes/ticket33075 deleted file mode 100644 index 69698d90b..000000000 --- a/changes/ticket33075 +++ /dev/null @@ -1,4 +0,0 @@ - o Testing: - - Stop allowing failures on the Travis CI stem tests job. It looks like all - the stem hangs we were seeing are now fixed, but let's make sure we see - them if they happen again. Closes ticket 33075. diff --git a/changes/ticket33091 b/changes/ticket33091 deleted file mode 100644 index 89efd9089..000000000 --- a/changes/ticket33091 +++ /dev/null @@ -1,3 +0,0 @@ - o Code simplification and refactoring (mainloop): - - Simplify the ip_address_changed() function by removing redundant checks. - Closes ticket 33091. diff --git a/changes/ticket33103 b/changes/ticket33103 deleted file mode 100644 index 889805f10..000000000 --- a/changes/ticket33103 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (controller): - - Fix a memory leak in GETINFO responses. Fixes bug 33103; - bugfix on 0.4.3.1-alpha. diff --git a/changes/ticket33139 b/changes/ticket33139 deleted file mode 100644 index a90ab8f73..000000000 --- a/changes/ticket33139 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (Onion service client, authorization): - - On a NEWNYM signal, purge the ephemeral client authorization cache. The - permanent ones are kept. Fixes bug 33139; bugfix on 0.4.3.1-alpha. diff --git a/changes/ticket33148 b/changes/ticket33148 deleted file mode 100644 index 1f44b4259..000000000 --- a/changes/ticket33148 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (onion service v3, client authorization): - - When removing client authorization credentials using the control port, - also remove the associated descriptor so they don't linger and are still - usable hence making the onion service behind client authorization - reachable. Fixes bug 33148; bugfix on 0.4.3.1-alpha. diff --git a/changes/ticket33212 b/changes/ticket33212 deleted file mode 100644 index aeb09e0c6..000000000 --- a/changes/ticket33212 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (rust, build): - - Fix a syntax warning given by newer versions of Rust, and creating - problems for our continuous integration. - Fixes bug 33212; bugfix on 0.3.5.1-alpha.

1 0

[tor/master] Merge branch 'bug33104_041'
by nickm＠torproject.org 10 Feb '20

10 Feb '20

commit eb8841cd9553d1bd7804018963abacf93a088f74 Merge: d9144700a b2c3cb1b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 14:23:13 2020 -0500 Merge branch 'bug33104_041' changes/bug33104 | 4 ++++ src/feature/control/control.c | 4 ++++ src/feature/control/control_events.c | 32 +++++++++-------------------- src/test/test_controller_events.c | 39 ++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 22 deletions(-) diff --cc src/test/test_controller_events.c index e9d09fbee,5b108ab31..60dfbd630 --- a/src/test/test_controller_events.c +++ b/src/test/test_controller_events.c @@@ -16,14 -15,11 +16,15 @@@ #include "core/or/orconn_event.h" #include "core/mainloop/connection.h" #include "feature/control/control_events.h" +#include "feature/control/control_fmt.h" #include "test/test.h" +#include "test/test_helpers.h" + #include "test/log_test_helpers.h" +#include "core/or/entry_connection_st.h" #include "core/or/or_circuit_st.h" #include "core/or/origin_circuit_st.h" +#include "core/or/socks_request_st.h" static void add_testing_cell_stats_entry(circuit_t *circ, uint8_t command, @@@ -399,12 -395,50 +400,49 @@@ test_cntev_dirboot_defer_orconn(void *a } static void + test_cntev_signal(void *arg) + { + (void)arg; + int rv; + + MOCK(queue_control_event_string, mock_queue_control_event_string); + + /* Nothing is listening for signals, so no event should be queued. */ + rv = control_event_signal(SIGHUP); + tt_int_op(0, OP_EQ, rv); + tt_ptr_op(saved_event_str, OP_EQ, NULL); + + /* Now try with signals included in the event mask. */ + control_testing_set_global_event_mask(EVENT_MASK_(EVENT_GOT_SIGNAL)); + rv = control_event_signal(SIGHUP); + tt_int_op(0, OP_EQ, rv); + tt_str_op(saved_event_str, OP_EQ, "650 SIGNAL RELOAD\r\n"); + + rv = control_event_signal(SIGACTIVE); + tt_int_op(0, OP_EQ, rv); + tt_str_op(saved_event_str, OP_EQ, "650 SIGNAL ACTIVE\r\n"); + + /* Try a signal that doesn't exist. */ + setup_full_capture_of_logs(LOG_WARN); + tor_free(saved_event_str); + rv = control_event_signal(99999); + tt_int_op(-1, OP_EQ, rv); + tt_ptr_op(saved_event_str, OP_EQ, NULL); + expect_single_log_msg_containing("Unrecognized signal 99999"); + + done: + tor_free(saved_event_str); + teardown_capture_of_logs(); + UNMOCK(queue_control_event_string); + } + + static void -setup_orconn_state(orconn_event_msg_t *msg, uint64_t gid, uint64_t chan, +setup_orconn_state(orconn_state_msg_t *msg, uint64_t gid, uint64_t chan, int proxy_type) { - msg->type = ORCONN_MSGTYPE_STATE; - msg->u.state.gid = gid; - msg->u.state.chan = chan; - msg->u.state.proxy_type = proxy_type; + msg->gid = gid; + msg->chan = chan; + msg->proxy_type = proxy_type; } static void @@@ -678,11 -577,11 +716,12 @@@ struct testcase_t controller_event_test TEST(append_cell_stats, TT_FORK), TEST(format_cell_stats, TT_FORK), TEST(event_mask, TT_FORK), - TEST(dirboot_defer_desc, TT_FORK), - TEST(dirboot_defer_orconn, TT_FORK), + TEST(format_stream, TT_FORK), + TEST(signal, TT_FORK), - TEST(orconn_state, TT_FORK), - TEST(orconn_state_pt, TT_FORK), - TEST(orconn_state_proxy, TT_FORK), + T_PUBSUB(dirboot_defer_desc, TT_FORK), + T_PUBSUB(dirboot_defer_orconn, TT_FORK), + T_PUBSUB(orconn_state, TT_FORK), + T_PUBSUB(orconn_state_pt, TT_FORK), + T_PUBSUB(orconn_state_proxy, TT_FORK), END_OF_TESTCASES };

1 0

[tor/master] Rewrite control_event_signal() to use signal_table.
by nickm＠torproject.org 10 Feb '20

10 Feb '20

commit 7bd671811ec38e8126ffc17cb922f2397c572cda Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 30 09:29:07 2020 -0500 Rewrite control_event_signal() to use signal_table. When we added the ACTIVE and DORMANT virtual signals, we taught the signal command to handle them, but we didn't teach SIGNAL event to report them. To solve this problem and prevent it from recurring, this patch revises the implementation of control_event_signal() to use the same signal_table that handle_control_signal() uses. This way, the two controller commands can't become out of sync. Fixes bug 33104; bugfix on 0.4.0.1-alpha. --- changes/bug33104 | 4 ++++ src/feature/control/control.c | 4 ++++ src/feature/control/control_events.c | 32 ++++++++++---------------------- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/changes/bug33104 b/changes/bug33104 new file mode 100644 index 000000000..b5478df10 --- /dev/null +++ b/changes/bug33104 @@ -0,0 +1,4 @@ + o Minor bugfixes (controller): + - When receiving "ACTIVE" or "DORMANT" signals on the control port, + report them as SIGNAL events. Fixes bug 33104; bugfix on + 0.4.0.1-alpha. diff --git a/src/feature/control/control.c b/src/feature/control/control.c index 436bf423c..71b864751 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -158,6 +158,10 @@ control_ports_write_to_file(void) } const struct signal_name_t signal_table[] = { + /* NOTE: this table is used for handling SIGNAL commands and generating + * SIGNAL events. Order is significant: if there are two entries for the + * same numeric signal, the first one is the canonical name generated + * for the events. */ { SIGHUP, "RELOAD" }, { SIGHUP, "HUP" }, { SIGINT, "SHUTDOWN" }, diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index 9e0966ca5..1089b608b 100644 --- a/src/feature/control/control_events.c +++ b/src/feature/control/control_events.c @@ -1552,29 +1552,17 @@ control_event_signal(uintptr_t signal_num) if (!control_event_is_interesting(EVENT_GOT_SIGNAL)) return 0; - switch (signal_num) { - case SIGHUP: - signal_string = "RELOAD"; + for (unsigned i = 0; signal_table[i].signal_name != NULL; ++i) { + if ((int)signal_num == signal_table[i].sig) { + signal_string = signal_table[i].signal_name; break; - case SIGUSR1: - signal_string = "DUMP"; - break; - case SIGUSR2: - signal_string = "DEBUG"; - break; - case SIGNEWNYM: - signal_string = "NEWNYM"; - break; - case SIGCLEARDNSCACHE: - signal_string = "CLEARDNSCACHE"; - break; - case SIGHEARTBEAT: - signal_string = "HEARTBEAT"; - break; - default: - log_warn(LD_BUG, "Unrecognized signal %lu in control_event_signal", - (unsigned long)signal_num); - return -1; + } + } + + if (signal_string == NULL) { + log_warn(LD_BUG, "Unrecognized signal %lu in control_event_signal", + (unsigned long)signal_num); + return -1; } send_control_event(EVENT_GOT_SIGNAL, "650 SIGNAL %s\r\n",

1 0

[tor/master] Add tests for control_event_signal.
by nickm＠torproject.org 10 Feb '20

10 Feb '20

commit b2c3cb1b26c41969776ed1fd1b20588430346e45 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 11:38:36 2020 -0500 Add tests for control_event_signal. --- src/test/test_controller_events.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/test/test_controller_events.c b/src/test/test_controller_events.c index 910aacace..5b108ab31 100644 --- a/src/test/test_controller_events.c +++ b/src/test/test_controller_events.c @@ -16,6 +16,7 @@ #include "core/mainloop/connection.h" #include "feature/control/control_events.h" #include "test/test.h" +#include "test/log_test_helpers.h" #include "core/or/or_circuit_st.h" #include "core/or/origin_circuit_st.h" @@ -394,6 +395,43 @@ test_cntev_dirboot_defer_orconn(void *arg) } static void +test_cntev_signal(void *arg) +{ + (void)arg; + int rv; + + MOCK(queue_control_event_string, mock_queue_control_event_string); + + /* Nothing is listening for signals, so no event should be queued. */ + rv = control_event_signal(SIGHUP); + tt_int_op(0, OP_EQ, rv); + tt_ptr_op(saved_event_str, OP_EQ, NULL); + + /* Now try with signals included in the event mask. */ + control_testing_set_global_event_mask(EVENT_MASK_(EVENT_GOT_SIGNAL)); + rv = control_event_signal(SIGHUP); + tt_int_op(0, OP_EQ, rv); + tt_str_op(saved_event_str, OP_EQ, "650 SIGNAL RELOAD\r\n"); + + rv = control_event_signal(SIGACTIVE); + tt_int_op(0, OP_EQ, rv); + tt_str_op(saved_event_str, OP_EQ, "650 SIGNAL ACTIVE\r\n"); + + /* Try a signal that doesn't exist. */ + setup_full_capture_of_logs(LOG_WARN); + tor_free(saved_event_str); + rv = control_event_signal(99999); + tt_int_op(-1, OP_EQ, rv); + tt_ptr_op(saved_event_str, OP_EQ, NULL); + expect_single_log_msg_containing("Unrecognized signal 99999"); + + done: + tor_free(saved_event_str); + teardown_capture_of_logs(); + UNMOCK(queue_control_event_string); +} + +static void setup_orconn_state(orconn_event_msg_t *msg, uint64_t gid, uint64_t chan, int proxy_type) { @@ -541,6 +579,7 @@ struct testcase_t controller_event_tests[] = { TEST(event_mask, TT_FORK), TEST(dirboot_defer_desc, TT_FORK), TEST(dirboot_defer_orconn, TT_FORK), + TEST(signal, TT_FORK), TEST(orconn_state, TT_FORK), TEST(orconn_state_pt, TT_FORK), TEST(orconn_state_proxy, TT_FORK),

1 0

[tor/maint-0.3.5] Fix a Rust compilation warning; resolve bug 33212.
by nickm＠torproject.org 10 Feb '20

10 Feb '20

commit 99d044d553c08d3b2900dbca30199083067515b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 13:32:09 2020 -0500 Fix a Rust compilation warning; resolve bug 33212. --- changes/ticket33212 | 4 ++++ src/rust/protover/protover.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/ticket33212 b/changes/ticket33212 new file mode 100644 index 000000000..aeb09e0c6 --- /dev/null +++ b/changes/ticket33212 @@ -0,0 +1,4 @@ + o Minor bugfixes (rust, build): + - Fix a syntax warning given by newer versions of Rust, and creating + problems for our continuous integration. + Fixes bug 33212; bugfix on 0.3.5.1-alpha. diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 2661d811c..06fdf56c6 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -26,7 +26,7 @@ const FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS: &'static str = "0.2.9.3-alpha"; /// before concluding that someone is trying to DoS us /// /// C_RUST_COUPLED: protover.c `MAX_PROTOCOLS_TO_EXPAND` -const MAX_PROTOCOLS_TO_EXPAND: usize = (1 << 16); +const MAX_PROTOCOLS_TO_EXPAND: usize = 1 << 16; /// The maximum size an `UnknownProtocol`'s name may be. pub(crate) const MAX_PROTOCOL_NAME_LENGTH: usize = 100;

1 0

[tor/maint-0.3.5] Merge branch 'bug33212_035' into maint-0.3.5
by nickm＠torproject.org 10 Feb '20

10 Feb '20

commit 2b6df3da21803519c262099ab9dd950271f3ce11 Merge: 41d52e9cd 99d044d55 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 14:17:03 2020 -0500 Merge branch 'bug33212_035' into maint-0.3.5 changes/ticket33212 | 4 ++++ src/rust/protover/protover.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.0] Fix a Rust compilation warning; resolve bug 33212.
by nickm＠torproject.org 10 Feb '20

10 Feb '20

commit 99d044d553c08d3b2900dbca30199083067515b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 13:32:09 2020 -0500 Fix a Rust compilation warning; resolve bug 33212. --- changes/ticket33212 | 4 ++++ src/rust/protover/protover.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/ticket33212 b/changes/ticket33212 new file mode 100644 index 000000000..aeb09e0c6 --- /dev/null +++ b/changes/ticket33212 @@ -0,0 +1,4 @@ + o Minor bugfixes (rust, build): + - Fix a syntax warning given by newer versions of Rust, and creating + problems for our continuous integration. + Fixes bug 33212; bugfix on 0.3.5.1-alpha. diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 2661d811c..06fdf56c6 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -26,7 +26,7 @@ const FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS: &'static str = "0.2.9.3-alpha"; /// before concluding that someone is trying to DoS us /// /// C_RUST_COUPLED: protover.c `MAX_PROTOCOLS_TO_EXPAND` -const MAX_PROTOCOLS_TO_EXPAND: usize = (1 << 16); +const MAX_PROTOCOLS_TO_EXPAND: usize = 1 << 16; /// The maximum size an `UnknownProtocol`'s name may be. pub(crate) const MAX_PROTOCOL_NAME_LENGTH: usize = 100;

1 0

[tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by nickm＠torproject.org 10 Feb '20

10 Feb '20

commit f3fa22bf1b52dfce65a37e6a84bac8635916e8c2 Merge: 65825018c 2b6df3da2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 14:17:09 2020 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket33212 | 4 ++++ src/rust/protover/protover.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.0] Merge branch 'bug33212_035' into maint-0.3.5
by nickm＠torproject.org 10 Feb '20

10 Feb '20

commit 2b6df3da21803519c262099ab9dd950271f3ce11 Merge: 41d52e9cd 99d044d55 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 14:17:03 2020 -0500 Merge branch 'bug33212_035' into maint-0.3.5 changes/ticket33212 | 4 ++++ src/rust/protover/protover.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.1] Fix a Rust compilation warning; resolve bug 33212.
by nickm＠torproject.org 10 Feb '20

10 Feb '20

commit 99d044d553c08d3b2900dbca30199083067515b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 10 13:32:09 2020 -0500 Fix a Rust compilation warning; resolve bug 33212. --- changes/ticket33212 | 4 ++++ src/rust/protover/protover.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/ticket33212 b/changes/ticket33212 new file mode 100644 index 000000000..aeb09e0c6 --- /dev/null +++ b/changes/ticket33212 @@ -0,0 +1,4 @@ + o Minor bugfixes (rust, build): + - Fix a syntax warning given by newer versions of Rust, and creating + problems for our continuous integration. + Fixes bug 33212; bugfix on 0.3.5.1-alpha. diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 2661d811c..06fdf56c6 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -26,7 +26,7 @@ const FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS: &'static str = "0.2.9.3-alpha"; /// before concluding that someone is trying to DoS us /// /// C_RUST_COUPLED: protover.c `MAX_PROTOCOLS_TO_EXPAND` -const MAX_PROTOCOLS_TO_EXPAND: usize = (1 << 16); +const MAX_PROTOCOLS_TO_EXPAND: usize = 1 << 16; /// The maximum size an `UnknownProtocol`'s name may be. pub(crate) const MAX_PROTOCOL_NAME_LENGTH: usize = 100;

1 0