- tor-commits - lists.torproject.org

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 08 Dec '15

08 Dec '15

commit 16a5d0ad27a623097a2003e1703f675c9474c071 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 8 15:45:43 2015 +0000 Update translations for abouttor-homepage --- zh_CN/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_CN/aboutTor.dtd b/zh_CN/aboutTor.dtd index 5f4363a..fa3d5f3 100644 --- a/zh_CN/aboutTor.dtd +++ b/zh_CN/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "关于 Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "警告：此浏览器版本较旧。"> <!ENTITY aboutTor.outOfDateTorOff.label "另外，该浏览器并非最新版本。"> <!ENTITY aboutTor.outOfDate2.label "点击洋葱图标，然后选择“Tor Browser 检查更新”。"> <!ENTITY aboutTor.check.label "测试 Tor 网络设置"> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "欢迎使用 Tor Browser"> +<!ENTITY aboutTor.success2.label "已连接到 Tor 网络。"> <!ENTITY aboutTor.success3.label "现在即可自由地匿名访问互联网。"> <!ENTITY aboutTor.failure.label "出错了！"> <!ENTITY aboutTor.failure2.label "Tor 无法在该浏览器下运行。">

1 0

[tor/master] Merge branch 'maint-0.2.7'
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit 252149e8b4697c570097acd514c433b8215f24dd Merge: b585cf3 c6a3375 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 10:23:56 2015 -0500 Merge branch 'maint-0.2.7' changes/bug17772 | 7 +++++++ src/or/routerlist.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit 1adc2bf66fedb1768c5013dcf5f4778fae453217 Merge: b53ff86 c3d11b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 10:20:21 2015 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug17772 | 7 +++++++ src/or/routerlist.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit c6a337557ae5c73e8dc8208b18f902e9eeb21404 Merge: eeb9751 1adc2bf Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 10:23:41 2015 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug17772 | 7 +++++++ src/or/routerlist.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --cc src/or/routerlist.c index 03729bd,af8e68e..79a5bb3 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@@ -1501,8 -1498,17 +1501,14 @@@ router_pick_directory_server_impl(dirin if ((type & EXTRAINFO_DIRINFO) && !router_supports_extrainfo(node->identity, is_trusted_extrainfo)) continue; - if (for_guard && node->using_as_guard) - continue; /* Don't make the same node a guard twice. */ - if ((type & MICRODESC_DIRINFO) && !is_trusted && - !node->rs->version_supports_microdesc_cache) - continue; + /* 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/master] Merge branch 'bug17772_024' into maint-0.2.4
by nickm＠torproject.org 08 Dec '15

08 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/master] Ensure node is a guard candidate when picking a directory guard
by nickm＠torproject.org 08 Dec '15

08 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/master] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 08 Dec '15

08 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/maint-0.2.6] Merge branch 'bug17772_024' into maint-0.2.4
by nickm＠torproject.org 08 Dec '15

08 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/maint-0.2.6] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 08 Dec '15

08 Dec '15

commit 1adc2bf66fedb1768c5013dcf5f4778fae453217 Merge: b53ff86 c3d11b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 10:20:21 2015 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug17772 | 7 +++++++ src/or/routerlist.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 08 Dec '15

08 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