[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed

2014-08-12 Thread translation
commit f08a8f735d205fb53b7fb0ea63968bb02991c815 Author: Translation commit bot translat...@torproject.org Date: Tue Aug 12 06:45:58 2014 + Update translations for tor-launcher-properties_completed --- fa/torlauncher.properties |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

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

2014-08-12 Thread translation
commit e7036c78a7a37e5df80c3b162f481a15e2091afd Author: Translation commit bot translat...@torproject.org Date: Tue Aug 12 06:46:09 2014 + Update translations for tor-launcher-network-settings_completed --- fa/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1

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

2014-08-12 Thread translation
commit 1dc50722cca57c794b0dc987f4542b63a51493a2 Author: Translation commit bot translat...@torproject.org Date: Tue Aug 12 06:46:06 2014 + Update translations for tor-launcher-network-settings --- fa/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2014-08-12 Thread translation
commit be61b0546ab94064ba3ce168b7ed0003e03780a8 Author: Translation commit bot translat...@torproject.org Date: Tue Aug 12 06:45:54 2014 + Update translations for tor-launcher-properties --- fa/torlauncher.properties |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff

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

2014-08-12 Thread translation
commit 629f185d90e179a94100913e9b2d1a712f16102e Author: Translation commit bot translat...@torproject.org Date: Tue Aug 12 06:45:36 2014 + Update translations for tails-greeter --- fa/fa.po |9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fa/fa.po

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

2014-08-12 Thread translation
commit 5b461fd308a62353083e591c5e93975352e76407 Author: Translation commit bot translat...@torproject.org Date: Tue Aug 12 06:45:42 2014 + Update translations for tails-greeter_completed --- fa/fa.po |9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git

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

2014-08-12 Thread translation
commit 13aabbdae398174580a2f5ca4b10ae8c0d4b2957 Author: Translation commit bot translat...@torproject.org Date: Tue Aug 12 11:15:21 2014 + Update translations for tails-greeter --- fa/fa.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/fa.po b/fa/fa.po index

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

2014-08-12 Thread translation
commit 2d0b2645fa4608fd32a29cf3b1e03301993add0a Author: Translation commit bot translat...@torproject.org Date: Tue Aug 12 11:15:25 2014 + Update translations for tails-greeter_completed --- fa/fa.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/fa.po

[tor-commits] r26914: {website} Remove obsolete statement about working on Chrome APIs in th (website/trunk/docs/en)

2014-08-12 Thread Lunar
Author: lunar Date: 2014-08-12 11:16:13 + (Tue, 12 Aug 2014) New Revision: 26914 Modified: website/trunk/docs/en/faq.wml Log: Remove obsolete statement about working on Chrome APIs in the FAQ The answer is still probably not optimal, but previously it was misleading. Wording courtesy of

[tor-commits] [onionoo/master] Add performance metrics to the servlet.

2014-08-12 Thread karsten
commit 4ac8773be3c5d2296fd3ae293427a33f42d9fe7d Author: Karsten Loesing karsten.loes...@gmx.net Date: Tue Aug 12 09:41:47 2014 +0200 Add performance metrics to the servlet. Implements #12655. --- .../onionoo/server/PerformanceMetrics.java | 198 +++

[tor-commits] [onionoo/master] Fix confusing log message.

2014-08-12 Thread karsten
commit bea10398addff8baa09f7490a7d60edb5f42e7a7 Author: Karsten Loesing karsten.loes...@gmx.net Date: Tue Aug 12 16:04:15 2014 +0200 Fix confusing log message. --- src/main/java/org/torproject/onionoo/server/PerformanceMetrics.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [onionoo/master] Allow robots to index the .html files.

2014-08-12 Thread karsten
commit f5b85859b09ff8164acc82dbea27fb15cb713bc8 Author: Karsten Loesing karsten.loes...@gmx.net Date: Tue Aug 12 16:15:27 2014 +0200 Allow robots to index the .html files. --- web/robots.txt |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/robots.txt

[tor-commits] r26915: {website} update torbrowser website tables to include alpha bundles (website/trunk/projects/en)

2014-08-12 Thread Erinn Clark
Author: erinn Date: 2014-08-12 16:32:36 + (Tue, 12 Aug 2014) New Revision: 26915 Modified: website/trunk/projects/en/torbrowser.wml Log: update torbrowser website tables to include alpha bundles Modified: website/trunk/projects/en/torbrowser.wml

[tor-commits] r26916: {website} update versions for TB 3.6.4 and 4.0-alpha-1 and finish upda (in website/trunk: include projects/en)

2014-08-12 Thread Erinn Clark
Author: erinn Date: 2014-08-12 17:56:25 + (Tue, 12 Aug 2014) New Revision: 26916 Modified: website/trunk/include/versions.wmi website/trunk/projects/en/torbrowser.wml Log: update versions for TB 3.6.4 and 4.0-alpha-1 and finish updating the torbrowser page Modified:

[tor-commits] r26917: {website} fix torbrowserbundlebetadir version (website/trunk/include)

2014-08-12 Thread Erinn Clark
Author: erinn Date: 2014-08-12 17:59:07 + (Tue, 12 Aug 2014) New Revision: 26917 Modified: website/trunk/include/versions.wmi Log: fix torbrowserbundlebetadir version Modified: website/trunk/include/versions.wmi === ---

[tor-commits] [ooni-probe/master] Add details on how to contribute to the README.md

2014-08-12 Thread art
commit 137ddd824694f12686dab3c4c130334653f2c756 Author: Arturo Filastò a...@fuffa.org Date: Tue Aug 12 20:07:33 2014 +0200 Add details on how to contribute to the README.md This closes https://trac.torproject.org/projects/tor/ticket/11980 --- README.md | 24

[tor-commits] [ooni-probe/master] Pep8 fixes

2014-08-12 Thread art
commit 49150087dded2885a9eb17d07c436fefe06c9104 Author: Arturo Filastò a...@fuffa.org Date: Sun Aug 10 20:10:54 2014 +0200 Pep8 fixes --- ooni/templates/scapyt.py | 35 +-- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git

[tor-commits] [ooni-probe/master] Fix a bug that lead ooniprobe to require root when set_pcap was not used.

2014-08-12 Thread art
commit ba88ae7622f86a9ebe8a4af8d1825daf3ff78aab Author: Arturo Filastò a...@fuffa.org Date: Sun Aug 10 20:01:47 2014 +0200 Fix a bug that lead ooniprobe to require root when set_pcap was not used. --- ooni/director.py |5 - ooni/oonicli.py |2 +-

[tor-commits] [ooni-probe/master] Add rsync support to doc Makefile

2014-08-12 Thread art
commit b2a05794f32510fa79b7811685f30d882531993d Author: Arturo Filastò a...@fuffa.org Date: Sun Aug 10 20:11:15 2014 +0200 Add rsync support to doc Makefile --- docs/Makefile |8 1 file changed, 8 insertions(+) diff --git a/docs/Makefile b/docs/Makefile index

[tor-commits] r26918: {website} Add a downloads-alpha anchor. (website/trunk/projects/en)

2014-08-12 Thread Mike Perry
Author: mikeperry Date: 2014-08-13 00:28:37 + (Wed, 13 Aug 2014) New Revision: 26918 Modified: website/trunk/projects/en/torbrowser.wml Log: Add a downloads-alpha anchor. Modified: website/trunk/projects/en/torbrowser.wml

[tor-commits] [bridgedb/develop] Copy captchas/ into run/ during 'before_script' .travis.yml section.

2014-08-12 Thread isis
commit c6ec7e51792029a28f1c31809e35a1c6f7e47bde Author: Isis Lovecruft i...@torproject.org Date: Thu Aug 7 06:27:56 2014 + Copy captchas/ into run/ during 'before_script' .travis.yml section. --- .travis.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [bridgedb/develop] Bump leekspin version to 0.2.0.

2014-08-12 Thread isis
commit 4d302bd3d391fb0174914a2ce035d1dcfaa707c0 Author: Isis Lovecruft i...@torproject.org Date: Thu Aug 7 11:28:36 2014 + Bump leekspin version to 0.2.0. --- .test.requirements.txt |2 +- .travis.requirements.txt |2 +- setup.py |2 +- 3 files changed, 3

[tor-commits] [bridgedb/develop] Start BridgeDB in before_script section of .travis.yml.

2014-08-12 Thread isis
commit d4d753f29cdda65861a60a15285c13186f6ac1c6 Author: Isis Lovecruft i...@torproject.org Date: Thu Aug 7 01:11:36 2014 + Start BridgeDB in before_script section of .travis.yml. --- .travis.yml | 10 ++ 1 file changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml

[tor-commits] [bridgedb/develop] Merge branch 'fix/9874-https' into fix/9874-email

2014-08-12 Thread isis
commit 321020ef0fcbb1507a3a0f38fed4b13267dff586 Merge: b15e76b 4d302bd Author: Isis Lovecruft i...@torproject.org Date: Thu Aug 7 12:10:44 2014 + Merge branch 'fix/9874-https' into fix/9874-email .test.requirements.txt |2 +- .travis.requirements.txt |2 +- setup.py

[tor-commits] [bridgedb/develop] Add test_https.py from trygve.

2014-08-12 Thread isis
commit d5556300a9f53c80760e12b13c94a93d041ca9ff Author: trygve tor-...@lists.torproject.org Date: Thu Aug 7 00:44:15 2014 + Add test_https.py from trygve. * FIXES part of #9874. See https://trac.torproject.org/projects/tor/attachment/ticket/9874/test_https.py ---

[tor-commits] [bridgedb/develop] Add --no-use-wheel when pip installing Travis CI dependencies.

2014-08-12 Thread isis
commit e01aedc7ebe9cd767c87e2f0ee1ad4fd1cf4e21f Author: Isis Lovecruft i...@torproject.org Date: Thu Aug 7 06:16:34 2014 + Add --no-use-wheel when pip installing Travis CI dependencies. --- .travis.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml

[tor-commits] [bridgedb/develop] Add 'mechanize==0.2.5' to .test.requirements.txt.

2014-08-12 Thread isis
commit c61af9b2aed80a98359720d46a40420a296cea48 Author: Isis Lovecruft i...@torproject.org Date: Thu Aug 7 00:55:41 2014 + Add 'mechanize==0.2.5' to .test.requirements.txt. --- .test.requirements.txt |1 + 1 file changed, 1 insertion(+) diff --git a/.test.requirements.txt

[tor-commits] [bridgedb/develop] Add '127.0.0.1' to copied bridgedb.conf in .travis.yml.

2014-08-12 Thread isis
commit b15e76b2d9441acf17856b888e27d1b5dd06169e Author: Isis Lovecruft i...@torproject.org Date: Thu Aug 7 11:02:30 2014 + Add '127.0.0.1' to copied bridgedb.conf in .travis.yml. This is necessary to run the tests in `lib/bridgedb/test/test_smtp.py`, and shouldn't be set on

[tor-commits] [bridgedb/develop] Move several test dependencies from .travis.yml to .travis.requirements.txt.

2014-08-12 Thread isis
commit 3c9b8732a5c9119837212056306deb4353d6e7bd Author: Isis Lovecruft i...@torproject.org Date: Thu Aug 7 06:06:31 2014 + Move several test dependencies from .travis.yml to .travis.requirements.txt. --- .travis.requirements.txt | 24 .travis.yml

[tor-commits] [bridgedb/develop] Also copy gnupghome/ to run/ in .travis.yml 'before_script'.

2014-08-12 Thread isis
commit 8d47543523f9120f8ea0fd93612782f50fcbe941 Author: Isis Lovecruft i...@torproject.org Date: Thu Aug 7 07:52:08 2014 + Also copy gnupghome/ to run/ in .travis.yml 'before_script'. --- .travis.yml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml

[tor-commits] [bridgedb/develop] Split unittests in test_bridgedb.py; refactor to use already running server.

2014-08-12 Thread isis
commit 9873fad412081d35e508de5c8dd095a17fd921cb Author: Isis Lovecruft i...@torproject.org Date: Thu Aug 7 07:47:05 2014 + Split unittests in test_bridgedb.py; refactor to use already running server. The unittests in `lib/bridgedb/test/test_bridgedb.py` now expect a

[tor-commits] [bridgedb/develop] Sphinxify bridgedb.test.test_https module docstring.

2014-08-12 Thread isis
commit 7ae1282581e3d690c310fa054a7d692f8cd2fe56 Author: Isis Lovecruft i...@torproject.org Date: Thu Aug 7 09:48:22 2014 + Sphinxify bridgedb.test.test_https module docstring. --- lib/bridgedb/test/test_https.py | 17 ++--- 1 file changed, 14 insertions(+), 3 deletions(-)

[tor-commits] [bridgedb/develop] Add test_smtp.py by trygve.

2014-08-12 Thread isis
commit c3e6c2168e48dcf51b5c57aa3061a213bd8fb39c Author: trygve tor-...@lists.torproject.org Date: Thu Aug 7 09:50:56 2014 + Add test_smtp.py by trygve. See https://trac.torproject.org/projects/tor/attachment/ticket/9874/test_smtp.py * FIXES part of #9874. ---

[tor-commits] [bridgedb/develop] Add file header to lib/bridgedb/test/test_https.py.

2014-08-12 Thread isis
commit e96ebb1b02f704a30fe63da863d2ea714d1ad1ec Author: Isis Lovecruft i...@torproject.org Date: Thu Aug 7 09:47:43 2014 + Add file header to lib/bridgedb/test/test_https.py. --- lib/bridgedb/test/test_https.py |9 + 1 file changed, 9 insertions(+) diff --git

[tor-commits] [bridgedb/develop] Merge branch 'fix/9874-https' into fix/9874-email

2014-08-12 Thread isis
commit f18ba06ffc7ff8031b3c074b4c4e656fbe0a9773 Merge: 3536724 be93cb7 Author: Isis Lovecruft i...@torproject.org Date: Fri Aug 8 03:12:59 2014 + Merge branch 'fix/9874-https' into fix/9874-email lib/bridgedb/test/test_https.py | 217 +-- 1 file

[tor-commits] [bridgedb/develop] PEP8 style fixes for bridgedb.test.test_smtp.

2014-08-12 Thread isis
commit fc127ad1e59601d0507a2ae802d333c220291a17 Author: trygve tor-...@lists.torproject.org Date: Fri Aug 8 03:30:05 2014 + PEP8 style fixes for bridgedb.test.test_smtp. --- lib/bridgedb/test/test_smtp.py | 76 +++- 1 file changed, 52

[tor-commits] [bridgedb/develop] Change EMAIL_SMTP_PORT to 2525 in copied bridgedb.conf for Travis.

2014-08-12 Thread isis
commit 353672434209b0fe58ba4e9ef1ae49942644f0b0 Author: Isis Lovecruft i...@torproject.org Date: Thu Aug 7 12:17:40 2014 + Change EMAIL_SMTP_PORT to 2525 in copied bridgedb.conf for Travis. --- .travis.yml |2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml

[tor-commits] [bridgedb/develop] Whitespace fixes for bridgedb.test.test_smtp.

2014-08-12 Thread isis
commit 209721600ce0f4249b516775eeea709a61142508 Author: trygve tor-...@lists.torproject.org Date: Fri Aug 8 03:15:49 2014 + Whitespace fixes for bridgedb.test.test_smtp. --- lib/bridgedb/test/test_smtp.py | 17 - 1 file changed, 8 insertions(+), 9 deletions(-) diff

[tor-commits] [bridgedb/develop] Change obfs3 ipv6 integration test to vanilla ipv4; add scramblesuit test.

2014-08-12 Thread isis
commit d798533ff482bd7c1a149d1d38bcc9dfb53da3bc Author: trygve tor-...@lists.torproject.org Date: Fri Aug 8 03:06:18 2014 + Change obfs3 ipv6 integration test to vanilla ipv4; add scramblesuit test. The ipv6 bridge has been changed to a vanilla ipv4 bridge. I've also added a

[tor-commits] [bridgedb/develop] Clarify comments in .travis.requirements.txt.

2014-08-12 Thread isis
commit 01562144625fe4d9d6ae3870583cfef456513a39 Author: Isis Lovecruft i...@torproject.org Date: Tue Aug 12 23:58:23 2014 + Clarify comments in .travis.requirements.txt. --- .travis.requirements.txt | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git

[tor-commits] [bridgedb/develop] Remove unused/extra imports `time` and `random` from test_smtp.py.

2014-08-12 Thread isis
commit cc2ea6208f1580f973fd0ed0e71cda6c838c763a Author: Isis Lovecruft i...@torproject.org Date: Fri Aug 8 11:27:39 2014 + Remove unused/extra imports `time` and `random` from test_smtp.py. --- lib/bridgedb/test/test_smtp.py |2 -- 1 file changed, 2 deletions(-) diff --git

[tor-commits] [bridgedb/develop] Merge branch 'fix/9874-email' into develop

2014-08-12 Thread isis
commit ef6a5e4fdf4b890a4bdd2c412e20b4e72fa0fa07 Merge: f565959 cc2ea62 Author: Isis Lovecruft i...@torproject.org Date: Tue Aug 12 23:45:16 2014 + Merge branch 'fix/9874-email' into develop .travis.yml|5 ++ lib/bridgedb/test/test_smtp.py | 165

[tor-commits] [bridgedb/develop] Whitespace fixes for bridgedb.test.test_https.

2014-08-12 Thread isis
commit be93cb7c849990bf516c33c1a440ca406b2b3cb9 Author: trygve tor-...@lists.torproject.org Date: Fri Aug 8 03:11:31 2014 + Whitespace fixes for bridgedb.test.test_https. --- lib/bridgedb/test/test_https.py | 210 +++ 1 file changed, 105

[tor-commits] [bridgedb/develop] Merge branch 'fix/9874-https' into develop

2014-08-12 Thread isis
commit b95d400ff0293cf6de9fe9c2fa7a2dd78f1ee809 Merge: 74cdb09 be93cb7 Author: Isis Lovecruft i...@torproject.org Date: Tue Aug 12 03:23:36 2014 + Merge branch 'fix/9874-https' into develop .test.requirements.txt |3 +- .travis.requirements.txt | 24 +

[tor-commits] [bridgedb/develop] Add CHANGELOG entry for #9874.

2014-08-12 Thread isis
commit f565959785b8a9bffd0014cef74427223ede7fab Author: Isis Lovecruft i...@torproject.org Date: Tue Aug 12 03:27:13 2014 + Add CHANGELOG entry for #9874. --- CHANGELOG |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index