[tor-commits] [torbrowser/master] Unrecommend TBB 3.6 and 3.6.1.

2014-06-10 Thread mikeperry
commit 8d09830148702e9f22fce29484ad724e306699c4 Author: Mike Perry Date: Tue Jun 10 18:10:03 2014 -0700 Unrecommend TBB 3.6 and 3.6.1. --- build-scripts/recommended-versions |6 -- 1 file changed, 6 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/reco

[tor-commits] [tor/master] Fix changes file for geoip

2014-06-10 Thread nickm
commit f5ce580babc5ca8466da02c53669a58bde8f5445 Author: Nick Mathewson Date: Tue Jun 10 21:08:44 2014 -0400 Fix changes file for geoip --- changes/geoip6-june2014 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/geoip6-june2014 b/changes/geoip6-june2014 index

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

2014-06-10 Thread nickm
commit 173a1afc5819f1fcabfa34bab5714d61088cc29f Merge: 55c7a55 f5ce580 Author: Nick Mathewson Date: Tue Jun 10 21:09:27 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/geoip6-june2014 |2 + src/config/geoip|22394 ---

[tor-commits] [tor/master] Merge remote-tracking branch 'karsten/geoip6-jun2014' into maint-0.2.4

2014-06-10 Thread nickm
commit 3bc28c4c04584d599c933491f3b2d11f2cef1aaf Merge: ab774a8 40579cb Author: Nick Mathewson Date: Tue Jun 10 21:08:12 2014 -0400 Merge remote-tracking branch 'karsten/geoip6-jun2014' into maint-0.2.4 changes/geoip6-june2014 |2 + src/config/geoip6 | 2115 ++

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

2014-06-10 Thread nickm
commit ab774a8500a6f4302296ff4c6ea23ba5c64eaa52 Merge: 8d9602c 555c43c Author: Nick Mathewson Date: Tue Jun 10 21:07:57 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 src/config/geoip |22394 +- 1 file chan

[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

2014-06-10 Thread nickm
commit ab774a8500a6f4302296ff4c6ea23ba5c64eaa52 Merge: 8d9602c 555c43c Author: Nick Mathewson Date: Tue Jun 10 21:07:57 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 src/config/geoip |22394 +- 1 file chan

[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'karsten/geoip6-jun2014' into maint-0.2.4

2014-06-10 Thread nickm
commit 3bc28c4c04584d599c933491f3b2d11f2cef1aaf Merge: ab774a8 40579cb Author: Nick Mathewson Date: Tue Jun 10 21:08:12 2014 -0400 Merge remote-tracking branch 'karsten/geoip6-jun2014' into maint-0.2.4 changes/geoip6-june2014 |2 + src/config/geoip6 | 2115 ++

[tor-commits] [tor/maint-0.2.4] Fix changes file for geoip

2014-06-10 Thread nickm
commit f5ce580babc5ca8466da02c53669a58bde8f5445 Author: Nick Mathewson Date: Tue Jun 10 21:08:44 2014 -0400 Fix changes file for geoip --- changes/geoip6-june2014 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/geoip6-june2014 b/changes/geoip6-june2014 index

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2014-06-10 Thread translation
commit eb4ba811052d2258824008db9cd1a23ad24e5956 Author: Translation commit bot Date: Tue Jun 10 21:15:31 2014 + Update translations for tor-launcher-network-settings --- pt_BR/network-settings.dtd |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pt_BR/netw

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2014-06-10 Thread translation
commit 7195268a17229f9a216f98641dd7752a3c493060 Author: Translation commit bot Date: Tue Jun 10 21:15:36 2014 + Update translations for tor-launcher-network-settings_completed --- pt_BR/network-settings.dtd |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/

[tor-commits] [tor-launcher/master] Bug #11699: Change & #160 to   in network-settings.dtd

2014-06-10 Thread brade
commit e9445a7eb437115e8956e4c95dd805aab8238c56 Author: Kathy Brade Date: Tue Jun 10 13:33:58 2014 -0400 Bug #11699: Change   to   in network-settings.dtd Remove 'si' locale files (locale has been removed from Transifex). --- src/chrome/locale/si/network-settings.dtd | 64

[tor-commits] r26824: {website} get rid of the numcpus faq entry, since tor guesses it now b (website/trunk/docs/en)

2014-06-10 Thread Roger Dingledine
Author: arma Date: 2014-06-10 16:25:19 + (Tue, 10 Jun 2014) New Revision: 26824 Modified: website/trunk/docs/en/faq.wml Log: get rid of the numcpus faq entry, since tor guesses it now by default Modified: website/trunk/docs/en/faq.wml ==

[tor-commits] [translation/tails-greeter_completed] Update translations for tails-greeter_completed

2014-06-10 Thread translation
commit df35817c85c1397b4cd682187c3ec126d476969d Author: Translation commit bot Date: Tue Jun 10 16:15:24 2014 + Update translations for tails-greeter_completed --- zh_CN/zh_CN.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po inde

[tor-commits] [translation/tails-greeter] Update translations for tails-greeter

2014-06-10 Thread translation
commit 97bf44bac5bd73c3058ad5c7f8c45fd525e30cb6 Author: Translation commit bot Date: Tue Jun 10 16:15:21 2014 + Update translations for tails-greeter --- zh_CN/zh_CN.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index 16ed3fc.

[tor-commits] r26823: {website} raise the example bandwidths, and fix a now-broken link (website/trunk/docs/en)

2014-06-10 Thread Roger Dingledine
Author: arma Date: 2014-06-10 16:12:20 + (Tue, 10 Jun 2014) New Revision: 26823 Modified: website/trunk/docs/en/faq.wml Log: raise the example bandwidths, and fix a now-broken link Modified: website/trunk/docs/en/faq.wml ===

[tor-commits] [metrics-db/master] Fix typo spotted by arma.

2014-06-10 Thread karsten
commit e4aa811ec31c55e3a5ebd1e4935471df9bf593f1 Author: Karsten Loesing Date: Tue Jun 10 18:09:26 2014 +0200 Fix typo spotted by arma. --- web/formats.html |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/formats.html b/web/formats.html index 9499235..92427c5 1006

[tor-commits] [metrics-db/master] Clarify ntor-onion-key lines and @type versions.

2014-06-10 Thread karsten
commit 4f1711dca9aa119e7220f33b25f1ed3efa57003d Author: Karsten Loesing Date: Tue Jun 10 17:41:30 2014 +0200 Clarify ntor-onion-key lines and @type versions. In b65f0a1, we included ntor-onion-key lines in sanitized bridge server descriptors but raised the @type version number

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug12227_024'

2014-06-10 Thread nickm
commit 55c7a559df5f349de21ca37ecfe19b736085c317 Merge: 307aa7e cca6198 Author: Nick Mathewson Date: Tue Jun 10 11:17:39 2014 -0400 Merge remote-tracking branch 'public/bug12227_024' changes/bug12227|5 + src/common/tortls.c |5 - 2 files changed, 9 insertions(+), 1 del

[tor-commits] [tor/master] Avoid illegal read off end of an array in prune_v2_cipher_list

2014-06-10 Thread nickm
commit cca6198c777dba463aeb4a8fba6a953cde9576a8 Author: Nick Mathewson Date: Tue Jun 10 11:11:47 2014 -0400 Avoid illegal read off end of an array in prune_v2_cipher_list This function is supposed to construct a list of all the ciphers in the "v2 link protocol cipher list" that

[tor-commits] [translation/tails-greeter_completed] Update translations for tails-greeter_completed

2014-06-10 Thread translation
commit ce5bd995a04f84fbd959d017c38457d8b995f0de Author: Translation commit bot Date: Tue Jun 10 15:15:26 2014 + Update translations for tails-greeter_completed --- zh_CN/zh_CN.po | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/zh_CN/zh_CN.p

[tor-commits] [translation/tails-greeter] Update translations for tails-greeter

2014-06-10 Thread translation
commit 2dcf81576bb9b6ee92efb1c50e602c72c412d163 Author: Translation commit bot Date: Tue Jun 10 15:15:22 2014 + Update translations for tails-greeter --- zh_CN/zh_CN.po | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po

[tor-commits] [torbrowser/master] Add 3.6.2 to recommended versions.

2014-06-10 Thread mikeperry
commit 4a59a66f8a1799c803be91c578a043e81f345f3d Author: Mike Perry Date: Tue Jun 10 07:06:06 2014 -0700 Add 3.6.2 to recommended versions. --- build-scripts/recommended-versions |5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-scripts/recommended-versions b

[tor-commits] r26822: {website} Bump TBB version (website/trunk/include)

2014-06-10 Thread Mike Perry
Author: mikeperry Date: 2014-06-10 14:03:37 + (Tue, 10 Jun 2014) New Revision: 26822 Modified: website/trunk/include/versions.wmi Log: Bump TBB version Modified: website/trunk/include/versions.wmi === --- website/trunk/include

[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2014-06-10 Thread translation
commit 22aa9f18b344f8227d2eb2e68ed2dfb6cee5840c Author: Translation commit bot Date: Tue Jun 10 13:15:23 2014 + Update translations for tails-persistence-setup_completed --- bg/bg.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bg/bg.po b/bg/bg.po index 9d1faf

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2014-06-10 Thread translation
commit 29992a94ee3e2393e8367fb66d5bb61dc2d57c0c Author: Translation commit bot Date: Tue Jun 10 13:15:21 2014 + Update translations for tails-persistence-setup --- bg/bg.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bg/bg.po b/bg/bg.po index 9d1fafd..940791d

[tor-commits] [tor-browser-bundle/master] Update component versions for the nightlies.

2014-06-10 Thread gk
commit 846204b4cccffbbca2cfa9f5659c7a8a3087a964 Author: Georg Koppen Date: Tue Jun 10 13:47:46 2014 + Update component versions for the nightlies. --- gitian/versions.nightly | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/versions.nightly b/gi

[tor-commits] [tor-browser-bundle/master] Revert "Bug 11630: Make rules.sqlite deterministic."

2014-06-10 Thread gk
commit 33b119203bc96160fd9ade5af984a2d4f5c74e29 Author: Georg Koppen Date: Tue Jun 10 13:32:31 2014 +0200 Revert "Bug 11630: Make rules.sqlite deterministic." This reverts commit d7dc1e0781aa2735e6ed98d68fed9f54f1c2a374. It turns out there is more to the deterministic issue tha

[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2014-06-10 Thread translation
commit 96b8d483539a93b97f64bb7af898e97a79241b9a Author: Translation commit bot Date: Tue Jun 10 09:45:25 2014 + Update translations for tails-persistence-setup_completed --- bg/bg.po | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/bg/bg.po

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2014-06-10 Thread translation
commit 908c4ccb2c6596e35ed247c12b4dc607ea142f38 Author: Translation commit bot Date: Tue Jun 10 09:45:22 2014 + Update translations for tails-persistence-setup --- bg/bg.po | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/bg/bg.po b/bg/bg.po