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

[tor/release-0.2.3] Merge branch 'disable_pathbias_warnings_v2' into maint-0.2.3
by arma＠torproject.org 04 Sep '12

04 Sep '12

commit d98f2996b0b7b8629ac05662976cb3e4f100efcd Merge: bffe0d3 b252ffa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 27 16:19:52 2012 -0400 Merge branch 'disable_pathbias_warnings_v2' into maint-0.2.3 changes/disable_pathbias_messages | 3 +++ src/or/circuitbuild.c | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-)

1 0

[tor/release-0.2.3] Quiet "Set buildtimeout to low val" warnings: make them info
by arma＠torproject.org 04 Sep '12

04 Sep '12

commit a7a4bbff47c92aa4df0a932492867d1601834118 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 27 16:37:09 2012 -0400 Quiet "Set buildtimeout to low val" warnings: make them info Fix for #6251 --- changes/bug6251 | 6 ++++++ src/or/circuitbuild.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug6251 b/changes/bug6251 new file mode 100644 index 0000000..c782a93 --- /dev/null +++ b/changes/bug6251 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Downgrade "set buildtimeout to low value" messages to INFO + severity; they were never an actual problem, there was never + anything reasonable to do about them, and they tended to spam + logs from time to time. Fix for bug 6251; bugfix on + 0.2.2.2-alpha. \ No newline at end of file diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index fcd13dc..e557601 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1627,7 +1627,7 @@ circuit_build_times_set_timeout(circuit_build_times_t *cbt) return; if (cbt->timeout_ms < circuit_build_times_min_timeout()) { - log_warn(LD_CIRC, "Set buildtimeout to low value %fms. Setting to %dms", + log_info(LD_CIRC, "Set buildtimeout to low value %fms. Setting to %dms", cbt->timeout_ms, circuit_build_times_min_timeout()); cbt->timeout_ms = circuit_build_times_min_timeout(); if (cbt->close_ms < cbt->timeout_ms) {

1 0

[tor/release-0.2.3] Merge branch 'bug6732' into maint-0.2.3
by arma＠torproject.org 04 Sep '12

04 Sep '12

commit b17bb543dab3e34f5076649707bc74d5d3bd62fd Merge: a7a4bbf 774979c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 31 18:39:11 2012 -0400 Merge branch 'bug6732' into maint-0.2.3 changes/bug6732 | 3 +++ doc/tor.1.txt | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.3] Document consensus and microdesc files
by arma＠torproject.org 04 Sep '12

04 Sep '12

commit 774979ca4584036d17dd96071ec565955d9f04a7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 31 11:35:47 2012 -0400 Document consensus and microdesc files Bugfix for #6732. --- changes/bug6732 | 3 +++ doc/tor.1.txt | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/changes/bug6732 b/changes/bug6732 new file mode 100644 index 0000000..7a744e0 --- /dev/null +++ b/changes/bug6732 @@ -0,0 +1,3 @@ + o Documentation: + - Add missing documentation for consensus and microdesc files. Fix for + bug 6732. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index e7ba848..971a0ef 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1876,7 +1876,10 @@ FILES __DataDirectory__**/cached-status/**:: The most recently downloaded network status document for each authority. Each file holds one such document; the filenames are the hexadecimal - identity key fingerprints of the directory authorities. + identity key fingerprints of the directory authorities. Mostly obsolete. + +__DataDirectory__**/cached-consensus** and/or **cached-microdesc-consensus**:: + The most recent consensus network status document we've downloaded. __DataDirectory__**/cached-descriptors** and **cached-descriptors.new**:: These files hold downloaded router statuses. Some routers may appear more @@ -1885,6 +1888,12 @@ __DataDirectory__**/cached-descriptors** and **cached-descriptors.new**:: a given router. The ".new" file is an append-only journal; when it gets too large, all entries are merged into a new cached-descriptors file. +__DataDirectory__**/cached-microdescs** and **cached-microdescs.new**:: + These files hold downloaded microdescriptors. Lines beginning with + @-signs are annotations that contain more information about a given + router. The ".new" file is an append-only journal; when it gets too + large, all entries are merged into a new cached-microdescs file. + __DataDirectory__**/cached-routers** and **cached-routers.new**:: Obsolete versions of cached-descriptors and cached-descriptors.new. When Tor can't find the newer files, it looks here instead.

1 0

[tor/release-0.2.3] fix whitespace and trivial typo
by arma＠torproject.org 04 Sep '12

04 Sep '12

commit 4bd90e20b92fbe2b93fc53e24254f00e663d057e Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Sep 3 02:09:39 2012 -0400 fix whitespace and trivial typo --- src/or/config.c | 2 +- src/or/microdesc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index d5e80cc..b9170f4 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -464,7 +464,7 @@ static config_var_t _option_vars[] = { /** Override default values with these if the user sets the TestingTorNetwork * option. */ static const config_var_t testing_tor_network_defaults[] = { - V(ServerDNSAllowBrokenConfig, BOOL, "1"), + V(ServerDNSAllowBrokenConfig, BOOL, "1"), V(DirAllowPrivateAddresses, BOOL, "1"), V(EnforceDistinctSubnets, BOOL, "0"), V(AssumeReachable, BOOL, "1"), diff --git a/src/or/microdesc.c b/src/or/microdesc.c index c1ac1c3..b4d22c1 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -653,7 +653,7 @@ microdesc_list_missing_digest256(networkstatus_t *ns, microdesc_cache_t *cache, return result; } -/** Launch download requests for mircodescriptors as appropriate. +/** Launch download requests for microdescriptors as appropriate. * * Specifically, we should launch download requests if we are configured to * download mirodescriptors, and there are some microdescriptors listed the

1 0

[tor/release-0.2.3] Merge branch 'maint-0.2.3' into release-0.2.3
by arma＠torproject.org 04 Sep '12

04 Sep '12

1 0

[tor/master] Make begindir_cutoff the same as general_cutoff
by nickm＠torproject.org 04 Sep '12

04 Sep '12

commit eb3d0796677b5d37f27caf8b11d2a2e2c18e5674 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 1 01:25:17 2012 -0400 Make begindir_cutoff the same as general_cutoff Allow one-hop directory fetching circuits the full "circuit build timeout" period, rather than just half of it, before failing them and marking the relay down. This fix should help reduce cases where clients declare relays (or worse, bridges) unreachable because the TLS handshake takes a few seconds to complete. Fixes bug 6743 (one piece of bug 3443); bugfix on 0.2.2.2-alpha, where we changed the timeout from a static 30 seconds. --- changes/bug6743 | 9 +++++++++ src/or/circuituse.c | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/changes/bug6743 b/changes/bug6743 new file mode 100644 index 0000000..6ec78f8 --- /dev/null +++ b/changes/bug6743 @@ -0,0 +1,9 @@ + o Minor bugfixes: + - Allow one-hop directory fetching circuits the full "circuit build + timeout" period, rather than just half of it, before failing them + and marking the relay down. This fix should help reduce cases where + clients declare relays (or worse, bridges) unreachable because + the TLS handshake takes a few seconds to complete. Fixes bug 6743; + bugfix on 0.2.2.2-alpha, where we changed the timeout from a static + 30 seconds. + diff --git a/src/or/circuituse.c b/src/or/circuituse.c index c34b698..20f124e 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -372,7 +372,7 @@ circuit_expire_building(void) } while (0) SET_CUTOFF(general_cutoff, circ_times.timeout_ms); - SET_CUTOFF(begindir_cutoff, circ_times.timeout_ms / 2.0); + SET_CUTOFF(begindir_cutoff, circ_times.timeout_ms); SET_CUTOFF(fourhop_cutoff, circ_times.timeout_ms * (4/3.0)); SET_CUTOFF(cannibalize_cutoff, circ_times.timeout_ms / 2.0); SET_CUTOFF(close_cutoff, circ_times.close_ms);

1 0

[tor/master] Merge remote-tracking branch 'arma/bug6743' into maint-0.2.3
by nickm＠torproject.org 04 Sep '12

04 Sep '12

commit acfd487e7dbf5fa1408a2bba7afff54bc7d0118e Merge: 4bd90e2 eb3d079 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 4 18:33:56 2012 -0400 Merge remote-tracking branch 'arma/bug6743' into maint-0.2.3 changes/bug6743 | 9 +++++++++ src/or/circuituse.c | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 04 Sep '12

04 Sep '12

commit 4d87919ba649790a2a6c446d112dd2a8ad34862d Merge: d7a646e acfd487 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 4 18:34:39 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6743 | 9 +++++++++ src/or/circuituse.c | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.3] Make begindir_cutoff the same as general_cutoff
by nickm＠torproject.org 04 Sep '12

04 Sep '12

commit eb3d0796677b5d37f27caf8b11d2a2e2c18e5674 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 1 01:25:17 2012 -0400 Make begindir_cutoff the same as general_cutoff Allow one-hop directory fetching circuits the full "circuit build timeout" period, rather than just half of it, before failing them and marking the relay down. This fix should help reduce cases where clients declare relays (or worse, bridges) unreachable because the TLS handshake takes a few seconds to complete. Fixes bug 6743 (one piece of bug 3443); bugfix on 0.2.2.2-alpha, where we changed the timeout from a static 30 seconds. --- changes/bug6743 | 9 +++++++++ src/or/circuituse.c | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/changes/bug6743 b/changes/bug6743 new file mode 100644 index 0000000..6ec78f8 --- /dev/null +++ b/changes/bug6743 @@ -0,0 +1,9 @@ + o Minor bugfixes: + - Allow one-hop directory fetching circuits the full "circuit build + timeout" period, rather than just half of it, before failing them + and marking the relay down. This fix should help reduce cases where + clients declare relays (or worse, bridges) unreachable because + the TLS handshake takes a few seconds to complete. Fixes bug 6743; + bugfix on 0.2.2.2-alpha, where we changed the timeout from a static + 30 seconds. + diff --git a/src/or/circuituse.c b/src/or/circuituse.c index c34b698..20f124e 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -372,7 +372,7 @@ circuit_expire_building(void) } while (0) SET_CUTOFF(general_cutoff, circ_times.timeout_ms); - SET_CUTOFF(begindir_cutoff, circ_times.timeout_ms / 2.0); + SET_CUTOFF(begindir_cutoff, circ_times.timeout_ms); SET_CUTOFF(fourhop_cutoff, circ_times.timeout_ms * (4/3.0)); SET_CUTOFF(cannibalize_cutoff, circ_times.timeout_ms / 2.0); SET_CUTOFF(close_cutoff, circ_times.close_ms);

1 0