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

[tor/master] Rename a verified unverified-consensus to cached-consensus on the disk
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 1c8f55310f6a9969dc8ae5e8566e971fd2ac50b4 Author: Deepesh Pathak <deepshpathak(a)gmail.com> Date: Sat Feb 3 06:45:52 2018 +0530 Rename a verified unverified-consensus to cached-consensus on the disk - Fixes ticket #4187 - Change the name of a unverified-*consensus to cached-*consensus on disk when it has been verified. --- changes/ticket4187 | 3 +++ src/or/networkstatus.c | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/changes/ticket4187 b/changes/ticket4187 new file mode 100644 index 000000000..6f6cba15b --- /dev/null +++ b/changes/ticket4187 @@ -0,0 +1,3 @@ + o Minor bugfix (rename verfied unverified consensus): + - Rename a verified unverfied consensus to cached-consenus on the disk. + Fixes bug 4187; bugfix on 0.3.3.0-alpha diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 31ecb2098..2a83bf008 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -237,7 +237,7 @@ router_reload_consensus_networkstatus(void) s = networkstatus_read_cached_consensus_impl(flav, flavor, 1); if (s) { if (networkstatus_set_current_consensus(s, flavor, - flags|NSSET_WAS_WAITING_FOR_CERTS, + flags | NSSET_WAS_WAITING_FOR_CERTS, NULL)) { log_info(LD_FS, "Couldn't load unverified consensus %s networkstatus " "from cache", flavor); @@ -1928,6 +1928,15 @@ networkstatus_set_current_consensus(const char *consensus, } } + /* Signatures from the consensus are verified */ + if (from_cache && was_waiting_for_certs) { + /* We check if the consensus is loaded from disk cache and that it + * it is an unverified consensus. If it is unverified, rename it to + * cached-*-consensus since it has been verified. */ + log_info(LD_DIR, "Unverified consensus signatures verified."); + tor_rename(unverified_fname, consensus_fname); + } + if (!from_cache && flav == usable_consensus_flavor()) control_event_client_status(LOG_NOTICE, "CONSENSUS_ARRIVED");

1 0

[tor/master] Merge remote-tracking branch 'fristonio/ticket4187'
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit df9d2de44119e09e8fc485c6ff57ca01c226abd1 Merge: 338dbdab9 1c8f55310 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 12:02:30 2018 -0500 Merge remote-tracking branch 'fristonio/ticket4187' changes/ticket4187 | 3 +++ src/or/networkstatus.c | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-)

1 0

[tor/master] tweak changelog for 4187
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit e5a990fc5a5440b48e49029e937c852fc45f246b Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 12:02:45 2018 -0500 tweak changelog for 4187 --- changes/ticket4187 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/changes/ticket4187 b/changes/ticket4187 index 6f6cba15b..c5f795b1a 100644 --- a/changes/ticket4187 +++ b/changes/ticket4187 @@ -1,3 +1,3 @@ - o Minor bugfix (rename verfied unverified consensus): - - Rename a verified unverfied consensus to cached-consenus on the disk. - Fixes bug 4187; bugfix on 0.3.3.0-alpha + o Minor bugfixes (directory client): + - When unverified-consensus is verified, rename it to cached-consenus. + Fixes bug 4187; bugfix on 0.2.0.3-alpha.

1 0

[tor/maint-0.3.3] Update tor.1.txt with the currently available log domains.
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 59a7b00384a6e5fb905b064faed62c5b969ffebd Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Feb 27 22:57:30 2018 +0100 Update tor.1.txt with the currently available log domains. See: https://bugs.torproject.org/25378 --- doc/tor.1.txt | 3 ++- src/common/log.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a8e5de7b5..9dbed2ef6 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -650,7 +650,8 @@ GENERAL OPTIONS + The currently recognized domains are: general, crypto, net, config, fs, protocol, mm, http, app, control, circ, rend, bug, dir, dirserv, or, edge, - acct, hist, and handshake. Domain names are case-insensitive. + + acct, hist, handshake, heartbeat, channel, sched, guard, consdiff, and dos. + Domain names are case-insensitive. + + For example, "`Log [handshake]debug [~net,~mm]info notice stdout`" sends to stdout: all handshake messages of any severity, all info-and-higher diff --git a/src/common/log.c b/src/common/log.c index d59e5a403..9f4a8b2bc 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -1258,7 +1258,10 @@ log_level_to_string(int level) } /** NULL-terminated array of names for log domains such that domain_list[dom] - * is a description of dom. */ + * is a description of dom. + * + * Remember to update doc/tor.1.txt if you modify this list. + * */ static const char *domain_list[] = { "GENERAL", "CRYPTO", "NET", "CONFIG", "FS", "PROTOCOL", "MM", "HTTP", "APP", "CONTROL", "CIRC", "REND", "BUG", "DIR", "DIRSERV",

1 0

[tor/maint-0.3.3] changes file for 25378
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit ccf0f77da1894a11502fa36767838f687a4494d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:58:22 2018 -0500 changes file for 25378 --- changes/bug25378 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug25378 b/changes/bug25378 new file mode 100644 index 000000000..4648a0a31 --- /dev/null +++ b/changes/bug25378 @@ -0,0 +1,4 @@ + o Documentation: + - Update the documentation for "Log" to include the current list + of logging domains. Closes ticket 25378. +

1 0

[tor/master] changes file for 25378
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit ccf0f77da1894a11502fa36767838f687a4494d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:58:22 2018 -0500 changes file for 25378 --- changes/bug25378 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug25378 b/changes/bug25378 new file mode 100644 index 000000000..4648a0a31 --- /dev/null +++ b/changes/bug25378 @@ -0,0 +1,4 @@ + o Documentation: + - Update the documentation for "Log" to include the current list + of logging domains. Closes ticket 25378. +

1 0

[tor/master] Update tor.1.txt with the currently available log domains.
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 59a7b00384a6e5fb905b064faed62c5b969ffebd Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Feb 27 22:57:30 2018 +0100 Update tor.1.txt with the currently available log domains. See: https://bugs.torproject.org/25378 --- doc/tor.1.txt | 3 ++- src/common/log.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a8e5de7b5..9dbed2ef6 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -650,7 +650,8 @@ GENERAL OPTIONS + The currently recognized domains are: general, crypto, net, config, fs, protocol, mm, http, app, control, circ, rend, bug, dir, dirserv, or, edge, - acct, hist, and handshake. Domain names are case-insensitive. + + acct, hist, handshake, heartbeat, channel, sched, guard, consdiff, and dos. + Domain names are case-insensitive. + + For example, "`Log [handshake]debug [~net,~mm]info notice stdout`" sends to stdout: all handshake messages of any severity, all info-and-higher diff --git a/src/common/log.c b/src/common/log.c index d59e5a403..9f4a8b2bc 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -1258,7 +1258,10 @@ log_level_to_string(int level) } /** NULL-terminated array of names for log domains such that domain_list[dom] - * is a description of dom. */ + * is a description of dom. + * + * Remember to update doc/tor.1.txt if you modify this list. + * */ static const char *domain_list[] = { "GENERAL", "CRYPTO", "NET", "CONFIG", "FS", "PROTOCOL", "MM", "HTTP", "APP", "CONTROL", "CIRC", "REND", "BUG", "DIR", "DIRSERV",

1 0

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

03 Mar '18

commit 338dbdab93328e00b5e80934ce0352bebaf9ce25 Merge: 62482ea27 ccf0f77da Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:59:27 2018 -0500 Merge branch 'maint-0.3.3' changes/bug25378 | 4 ++++ doc/tor.1.txt | 3 ++- src/common/log.c | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.3] Update tor.1.txt with the currently available log domains.
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit 59a7b00384a6e5fb905b064faed62c5b969ffebd Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Feb 27 22:57:30 2018 +0100 Update tor.1.txt with the currently available log domains. See: https://bugs.torproject.org/25378 --- doc/tor.1.txt | 3 ++- src/common/log.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a8e5de7b5..9dbed2ef6 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -650,7 +650,8 @@ GENERAL OPTIONS + The currently recognized domains are: general, crypto, net, config, fs, protocol, mm, http, app, control, circ, rend, bug, dir, dirserv, or, edge, - acct, hist, and handshake. Domain names are case-insensitive. + + acct, hist, handshake, heartbeat, channel, sched, guard, consdiff, and dos. + Domain names are case-insensitive. + + For example, "`Log [handshake]debug [~net,~mm]info notice stdout`" sends to stdout: all handshake messages of any severity, all info-and-higher diff --git a/src/common/log.c b/src/common/log.c index d59e5a403..9f4a8b2bc 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -1258,7 +1258,10 @@ log_level_to_string(int level) } /** NULL-terminated array of names for log domains such that domain_list[dom] - * is a description of dom. */ + * is a description of dom. + * + * Remember to update doc/tor.1.txt if you modify this list. + * */ static const char *domain_list[] = { "GENERAL", "CRYPTO", "NET", "CONFIG", "FS", "PROTOCOL", "MM", "HTTP", "APP", "CONTROL", "CIRC", "REND", "BUG", "DIR", "DIRSERV",

1 0

[tor/release-0.3.3] changes file for 25378
by nickm＠torproject.org 03 Mar '18

03 Mar '18

commit ccf0f77da1894a11502fa36767838f687a4494d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 3 11:58:22 2018 -0500 changes file for 25378 --- changes/bug25378 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug25378 b/changes/bug25378 new file mode 100644 index 000000000..4648a0a31 --- /dev/null +++ b/changes/bug25378 @@ -0,0 +1,4 @@ + o Documentation: + - Update the documentation for "Log" to include the current list + of logging domains. Closes ticket 25378. +

1 0