[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

2016-09-20 Thread nickm
commit a8b607bfddd1acf2896cb12dd80389e4b1d66a24 Merge: f527a80 9ebe202 Author: Nick Mathewson Date: Tue Sep 20 19:30:38 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug20103 | 7 +++ src/or/networkstatus.c | 24 +--- 2 files changed, 20 i

[tor-commits] [tor/release-0.2.8] Don't look at any routerstatus_t when the networkstatus is inconsistent

2016-09-20 Thread nickm
commit 9b5a19c64b8195298753b3cd7059e8fcaaabe5bd Author: Nick Mathewson Date: Mon Sep 19 12:03:58 2016 -0400 Don't look at any routerstatus_t when the networkstatus is inconsistent For a brief moment in networkstatus_set_current_consensus(), the old consensus has been freed, but

[tor-commits] [tor/maint-0.2.8] Merge remote-tracking branch 'public/bug20103_028_v3' into maint-0.2.8

2016-09-20 Thread nickm
commit 9ebe202da0c56ed6c006a0410a636a9e99d111f7 Merge: 19a9872 9b5a19c Author: Nick Mathewson Date: Tue Sep 20 19:30:24 2016 -0400 Merge remote-tracking branch 'public/bug20103_028_v3' into maint-0.2.8 changes/bug20103 | 7 +++ src/or/networkstatus.c | 24 +-

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug20103_028_v3' into maint-0.2.8

2016-09-20 Thread nickm
commit 9ebe202da0c56ed6c006a0410a636a9e99d111f7 Merge: 19a9872 9b5a19c Author: Nick Mathewson Date: Tue Sep 20 19:30:24 2016 -0400 Merge remote-tracking branch 'public/bug20103_028_v3' into maint-0.2.8 changes/bug20103 | 7 +++ src/or/networkstatus.c | 24 +-

[tor-commits] [tor/release-0.2.8] Merge remote-tracking branch 'public/bug20103_028_v3' into maint-0.2.8

2016-09-20 Thread nickm
commit 9ebe202da0c56ed6c006a0410a636a9e99d111f7 Merge: 19a9872 9b5a19c Author: Nick Mathewson Date: Tue Sep 20 19:30:24 2016 -0400 Merge remote-tracking branch 'public/bug20103_028_v3' into maint-0.2.8 changes/bug20103 | 7 +++ src/or/networkstatus.c | 24 +-

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

2016-09-20 Thread nickm
commit 62ee4f185f984f11d75522eedcee92d1f15fc7a6 Merge: 06d99aa 9ebe202 Author: Nick Mathewson Date: Tue Sep 20 19:30:45 2016 -0400 Merge branch 'maint-0.2.8' changes/bug20103 | 7 +++ src/or/networkstatus.c | 24 +--- 2 files changed, 20 insertions(+), 11 de

[tor-commits] [tor/master] Don't look at any routerstatus_t when the networkstatus is inconsistent

2016-09-20 Thread nickm
commit 9b5a19c64b8195298753b3cd7059e8fcaaabe5bd Author: Nick Mathewson Date: Mon Sep 19 12:03:58 2016 -0400 Don't look at any routerstatus_t when the networkstatus is inconsistent For a brief moment in networkstatus_set_current_consensus(), the old consensus has been freed, but

[tor-commits] [tor/maint-0.2.8] Don't look at any routerstatus_t when the networkstatus is inconsistent

2016-09-20 Thread nickm
commit 9b5a19c64b8195298753b3cd7059e8fcaaabe5bd Author: Nick Mathewson Date: Mon Sep 19 12:03:58 2016 -0400 Don't look at any routerstatus_t when the networkstatus is inconsistent For a brief moment in networkstatus_set_current_consensus(), the old consensus has been freed, but

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

2016-09-20 Thread nickm
commit 06d99aa2c42de6013b3fa55ac03c661f57f90047 Merge: 32926b0 19a9872 Author: Nick Mathewson Date: Tue Sep 20 19:29:17 2016 -0400 Merge branch 'maint-0.2.8' src/or/fallback_dirs.inc | 46 ++ 1 file changed, 30 insertions(+), 16 deletions(-) __

[tor-commits] [tor/master] Update hard-coded fallback list based on pre-0.2.9 checks

2016-09-20 Thread nickm
commit c6d51b45770497227115f1a1d474cb5a8d582dd9 Author: teor Date: Tue Sep 20 16:49:45 2016 +1000 Update hard-coded fallback list based on pre-0.2.9 checks --- src/or/fallback_dirs.inc | 54 +++- 1 file changed, 35 insertions(+), 19 deletions(-)

[tor-commits] [tor/release-0.2.8] Update hard-coded fallback list based on pre-0.2.9 checks

2016-09-20 Thread nickm
commit c6d51b45770497227115f1a1d474cb5a8d582dd9 Author: teor Date: Tue Sep 20 16:49:45 2016 +1000 Update hard-coded fallback list based on pre-0.2.9 checks --- src/or/fallback_dirs.inc | 54 +++- 1 file changed, 35 insertions(+), 19 deletions(-)

[tor-commits] [tor/release-0.2.8] fixup! Update hard-coded fallback list based on pre-0.2.9 checks

2016-09-20 Thread nickm
commit 19a9872be2e91e367b85795186c29a077223e91e Author: teor Date: Wed Sep 21 09:13:04 2016 +1000 fixup! Update hard-coded fallback list based on pre-0.2.9 checks --- src/or/fallback_dirs.inc | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/or/fallback_dirs.i

[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

2016-09-20 Thread nickm
commit f527a809b3adbb1379465f2c5c7238502c2f3877 Merge: 8a163e9 19a9872 Author: Nick Mathewson Date: Tue Sep 20 19:29:03 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 src/or/fallback_dirs.inc | 46 ++ 1 file changed, 30 insertions(+),

[tor-commits] [tor/master] fixup! Update hard-coded fallback list based on pre-0.2.9 checks

2016-09-20 Thread nickm
commit 19a9872be2e91e367b85795186c29a077223e91e Author: teor Date: Wed Sep 21 09:13:04 2016 +1000 fixup! Update hard-coded fallback list based on pre-0.2.9 checks --- src/or/fallback_dirs.inc | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/or/fallback_dirs.i

[tor-commits] [tor/maint-0.2.8] Update hard-coded fallback list based on pre-0.2.9 checks

2016-09-20 Thread nickm
commit c6d51b45770497227115f1a1d474cb5a8d582dd9 Author: teor Date: Tue Sep 20 16:49:45 2016 +1000 Update hard-coded fallback list based on pre-0.2.9 checks --- src/or/fallback_dirs.inc | 54 +++- 1 file changed, 35 insertions(+), 19 deletions(-)

[tor-commits] [tor/maint-0.2.8] fixup! Update hard-coded fallback list based on pre-0.2.9 checks

2016-09-20 Thread nickm
commit 19a9872be2e91e367b85795186c29a077223e91e Author: teor Date: Wed Sep 21 09:13:04 2016 +1000 fixup! Update hard-coded fallback list based on pre-0.2.9 checks --- src/or/fallback_dirs.inc | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/or/fallback_dirs.i

[tor-commits] [tor/master] dns: Always enable DNS request for our DNSPort

2016-09-20 Thread nickm
commit 32926b008b6c2a95966c6307ca4f1c920c920d44 Author: David Goulet Date: Tue Sep 20 15:00:24 2016 -0400 dns: Always enable DNS request for our DNSPort Commit 41cc1f612bd2112ab7cec0cc4fdeb68c26e231bf introduced a "dns_request" configuration value which wasn't set to 1 for an e

[tor-commits] [webwml/master] Add new Tor Browser versions: 6.5a3, 6.5a3-hardened

2016-09-20 Thread boklm
commit 9345ce0de83a7dcbd0ee155deb2c5937e1c39045 Author: Nicolas Vigier Date: Tue Sep 20 22:38:51 2016 +0200 Add new Tor Browser versions: 6.5a3, 6.5a3-hardened --- include/versions.wmi | 18 +- projects/torbrowser/RecommendedTBBVersions | 8 +++-

[tor-commits] [trunnel/master] Add const accessor functions taking const pointers.

2016-09-20 Thread nickm
commit 6d4f1c42d72b881ea5b676291059d962ec9157a2 Author: Nick Mathewson Date: Wed Sep 14 16:39:05 2016 -0400 Add const accessor functions taking const pointers. --- lib/trunnel/CodeGen.py | 51 -- 1 file changed, 49 insertions(+), 2 deletions(

[tor-commits] [trunnel/master] Increment version number to 1.5

2016-09-20 Thread nickm
commit a27cad773a903d1691d3587c7fcdcfc76fe7ec03 Author: Nick Mathewson Date: Tue Sep 20 13:39:12 2016 -0400 Increment version number to 1.5 --- lib/trunnel/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/trunnel/__init__.py b/lib/trunnel/__init__.py inde

[tor-commits] [tor-browser-bundle/maint-6.0] Fix bug in changelog

2016-09-20 Thread gk
commit ae4e1c26e4dd6ba37fa7b930c28b6a2c9db4d5ca Author: Georg Koppen Date: Tue Sep 20 14:23:01 2016 + Fix bug in changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.

[tor-commits] [tor-browser-bundle/hardened-builds] Fix bug in changelog

2016-09-20 Thread gk
commit 369588783e9ffb3b2441e226696798df395382f4 Author: Georg Koppen Date: Tue Sep 20 14:22:22 2016 + Fix bug in changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.

[tor-commits] [tor-browser-bundle/master] Fix bug in changelog

2016-09-20 Thread gk
commit 7014b0ff1e63b01353801c40d2db9a7c54970182 Author: Georg Koppen Date: Tue Sep 20 14:17:01 2016 + Fix bug in changelog --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/Change

[tor-commits] [snowflake/master] initial client roundtrip estimate on broker

2016-09-20 Thread serene
commit 47e1338290359755308825ca66008e2df94cab60 Author: Serene H Date: Tue Sep 20 06:26:21 2016 -0700 initial client roundtrip estimate on broker --- broker/broker.go | 25 ++--- broker/metrics.go | 17 + client/torrc | 2 +- proxy/

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2016-09-20 Thread translation
commit aa62c74a1a99063863062b66df7f47c87dd9ef44 Author: Translation commit bot Date: Tue Sep 20 10:46:33 2016 + Update translations for torbutton-torbuttondtd --- zh_CN/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutt

[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd

2016-09-20 Thread translation
commit 9fc1096147c346fb5ecf16e141b62dcfc7a09295 Author: Translation commit bot Date: Tue Sep 20 10:18:11 2016 + Update translations for tor-messenger-prefsdtd --- zh_CN/prefs.dtd | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/prefs.dtd b/zh_CN/prefs.d