December 2015 - tor-commits - lists.torproject.org

[tor/release-0.2.7] Merge branch 'maint-0.2.7' into release-0.2.7
by arma＠torproject.org 10 Dec '15

10 Dec '15

commit b2a53e8ca910391a10451860a1aaf66b3c207f50 Merge: e0fa07c c6a3375 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Dec 10 04:12:10 2015 -0500 Merge branch 'maint-0.2.7' into release-0.2.7 changes/bug16056 | 4 + changes/bug16702 | 4 + changes/bug17551 | 4 + changes/bug17722 | 3 + changes/bug17772 | 7 + changes/bug17781 | 3 + changes/geoip-december2015 | 4 + configure.ac | 3 + src/config/geoip | 4547 ++++++++++++++++++++++++++++++++------------ src/config/geoip6 | 2580 +++++++++++++++++++++---- src/or/policies.c | 6 +- src/or/rendservice.c | 3 +- src/or/routerlist.c | 10 +- src/or/torcert.c | 6 +- 14 files changed, 5558 insertions(+), 1626 deletions(-)

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.4' into maint-0.2.5
by arma＠torproject.org 10 Dec '15

10 Dec '15

commit c3d11b119dbd46fa02a1e26d76ddc74424dd4b18 Merge: 4328525 35deb4d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 10:20:14 2015 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug17772 | 7 +++++++ src/or/routerlist.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.7] Merge branch 'bug17772_024' into maint-0.2.4
by arma＠torproject.org 10 Dec '15

10 Dec '15

commit 35deb4d442da38d7dcfb235665da50f3a4f7c293 Merge: b0867fe 5138f5c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 10:18:31 2015 -0500 Merge branch 'bug17772_024' into maint-0.2.4 changes/bug17772 | 7 +++++++ src/or/routerlist.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.7] Ensure node is a guard candidate when picking a directory guard
by arma＠torproject.org 10 Dec '15

10 Dec '15

commit 5138f5ca6957166febe98d5b6841936d7c20d0ad Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Dec 7 20:28:26 2015 -0800 Ensure node is a guard candidate when picking a directory guard --- changes/bug17772 | 7 +++++++ src/or/routerlist.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/changes/bug17772 b/changes/bug17772 new file mode 100644 index 0000000..54d457c --- /dev/null +++ b/changes/bug17772 @@ -0,0 +1,7 @@ + o Major bugfixes (guard selection): + - Actually look at the Guard flag when selecting a new directory + guard. When we implemented the directory guard design, we + accidentally started treating all relays as if they have the Guard + flag during guard selection, leading to weaker anonymity and worse + performance. Fixes bug 17222; bugfix on 0.2.4.8-alpha. Discovered + by Mohsen Imani. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 8fe496b..9ad763c 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1537,8 +1537,14 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags) if ((type & MICRODESC_DIRINFO) && !is_trusted && !node->rs->version_supports_microdesc_cache) continue; - if (for_guard && node->using_as_guard) - continue; /* Don't make the same node a guard twice. */ + /* Don't make the same node a guard twice */ + if (for_guard && node->using_as_guard) { + continue; + } + /* Ensure that a directory guard is actually a guard node. */ + if (for_guard && !node->is_possible_guard) { + continue; + } if (try_excluding && routerset_contains_routerstatus(options->ExcludeNodes, status, country)) {

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.5' into maint-0.2.6
by arma＠torproject.org 10 Dec '15

10 Dec '15

commit b53ff8606714c2f94d251a40c1a073bca760495e Merge: 089ee13 4328525 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 09:43:25 2015 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug17781 | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7
by arma＠torproject.org 10 Dec '15

10 Dec '15

commit eeb9751eadd148e5077cedb28f75e756b47281c0 Merge: e9bf584 b53ff86 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 09:43:42 2015 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug17781 | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/release-0.2.7] Fix a compilation warning introduced by clang 3.6
by arma＠torproject.org 10 Dec '15

10 Dec '15

commit b0867fec964a8692e9c605da82b3a3393eeaf451 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 09:37:05 2015 -0500 Fix a compilation warning introduced by clang 3.6 There was a dead check when we made sure that an array member of a struct was non-NULL. Tor has been doing this check since at least 0.2.3, maybe earlier. Fixes bug 17781. --- changes/bug17781 | 3 +++ src/or/connection_edge.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug17781 b/changes/bug17781 new file mode 100644 index 0000000..01ed231 --- /dev/null +++ b/changes/bug17781 @@ -0,0 +1,3 @@ + o Compilation fixes: + - Fix a compilation warning with Clang 3.6: Do not check the + presence of an address which can never be NULL. Fixes bug 17781. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 895c0f7..39f8af6 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -748,7 +748,7 @@ connection_ap_fail_onehop(const char *failed_digest, /* we don't know the digest; have to compare addr:port */ tor_addr_t addr; if (!build_state || !build_state->chosen_exit || - !entry_conn->socks_request || !entry_conn->socks_request->address) + !entry_conn->socks_request) continue; if (tor_addr_parse(&addr, entry_conn->socks_request->address)<0 || !tor_addr_eq(&build_state->chosen_exit->addr, &addr) ||

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.4' into maint-0.2.5
by arma＠torproject.org 10 Dec '15

10 Dec '15

commit 432852577000ab5eb07ae3ca961a36e5f6e796ba Merge: e8e89fd b0867fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 09:38:48 2015 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug17781 | 3 +++ src/or/connection_edge.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.7] Format IPv6 policies correctly.
by arma＠torproject.org 10 Dec '15

10 Dec '15

commit e9bf584694a592852293b945575d17ea4c3b742b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 08:42:52 2015 -0500 Format IPv6 policies correctly. Previously we'd suppressed the mask-bits field in the output when formatting a policy if it was >=32. But that should be a >=128 if we're talking about IPv6. Since we didn't put these in descriptors, this bug affects only log messages and controller outputs. Fix for bug 16056. The code in question was new in 0.2.0, but the bug was introduced in 0.2.4 when we started supporting IPv6 exits. --- changes/bug16056 | 4 ++++ src/or/policies.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/bug16056 b/changes/bug16056 new file mode 100644 index 0000000..e3311c0 --- /dev/null +++ b/changes/bug16056 @@ -0,0 +1,4 @@ + o Minor bugfixes (relay, IPv6): + - When displaying an IPv6 exit policy, include the mask bits correctly + even when the number is greater than 31. Fixes bug 16056; bugfix on + 0.2.4.7-alpha. Patch from "gturner". \ No newline at end of file diff --git a/src/or/policies.c b/src/or/policies.c index 9c858ec..b247e6a 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1391,9 +1391,9 @@ policy_write_item(char *buf, size_t buflen, addr_policy_t *policy, if (result < 0) return -1; written += strlen(buf); - /* If the maskbits is 32 we don't need to give it. If the mask is 0, - * we already wrote "*". */ - if (policy->maskbits < 32 && policy->maskbits > 0) { + /* If the maskbits is 32 (IPv4) or 128 (IPv6) we don't need to give it. If + the mask is 0, we already wrote "*". */ + if (policy->maskbits < (is_ip6?128:32) && policy->maskbits > 0) { if (tor_snprintf(buf+written, buflen-written, "/%d", policy->maskbits)<0) return -1; written += strlen(buf+written);

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7
by arma＠torproject.org 10 Dec '15

10 Dec '15

commit 9c66afe7720aa32a2640564bbf8b0af64e394ba5 Merge: e408aa3 089ee13 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 7 10:11:21 2015 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-december2015 | 4 + src/config/geoip | 4547 ++++++++++++++++++++++++++++++++------------ src/config/geoip6 | 2580 +++++++++++++++++++++---- 3 files changed, 5512 insertions(+), 1619 deletions(-)

1 0