[tor-commits] [orbot/master] fixing flag typo

2015-04-15 Thread n8fr8
commit 84c6645220dfc570c332967e419e9e4abdff82b9 Author: Nathan Freitas nat...@freitas.net Date: Wed Apr 15 10:15:38 2015 -0400 fixing flag typo --- external/Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Makefile b/external/Makefile index

[tor-commits] [tor/master] Make --hash-password imply --hush to prevent unnecessary noise.

2015-04-15 Thread nickm
commit 59e753a4a6751a38c9caa0731c883cd1d8ac07c2 Author: cypherpunks cypherpu...@torproject.org Date: Fri Apr 10 16:10:44 2015 +0200 Make --hash-password imply --hush to prevent unnecessary noise. --- changes/ticket15542 |3 +++ src/or/main.c |3 ++- 2 files changed, 5

[tor-commits] [tor/master] chagnes file for 15542

2015-04-15 Thread nickm
commit 7e6437babcea32c98cb028796bff1f81675b2c3b Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 15 09:40:27 2015 -0400 chagnes file for 15542 --- changes/15542 |3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/15542 b/changes/15542 new file mode 100644 index

[tor-commits] [translation/tor_animation_completed] Update translations for tor_animation_completed

2015-04-15 Thread translation
commit 46fc7ccb10ebef893d37c52e944284680efe248f Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 12:45:57 2015 + Update translations for tor_animation_completed --- ru.srt | 165 1 file changed,

[tor-commits] [translation/tor_animation] Update translations for tor_animation

2015-04-15 Thread translation
commit 80689eb192318009941b62e65f605d407991170b Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 12:45:53 2015 + Update translations for tor_animation --- ru.srt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ru.srt b/ru.srt index

[tor-commits] [tor-browser-bundle/master] Bug 15670: add support for the no_update_for option in config.yml

2015-04-15 Thread gk
commit 7d7faa30b4443f0cc76474738a36fd3f45e875f4 Author: Nicolas Vigier bo...@torproject.org Date: Mon Apr 13 19:53:11 2015 +0200 Bug 15670: add support for the no_update_for option in config.yml --- tools/update-responses/update_responses |4 1 file changed, 4 insertions(+) diff

[tor-commits] [orbot/master] fix PIE_FLAGS variable to allow for override

2015-04-15 Thread n8fr8
commit dbe3024dfc048cefd846426463e685a58a7eb56e Author: Nathan Freitas nat...@freitas.net Date: Wed Apr 15 09:58:02 2015 -0400 fix PIE_FLAGS variable to allow for override also, standardize use of STRIP command --- external/Makefile | 15 +-- 1 file changed, 9

[tor-commits] [orbot/master] handle NPE on number format instance

2015-04-15 Thread n8fr8
commit 1bc427b50e91c30bdb0f75a2b31f9f8c7f9c6403 Author: Nathan Freitas nat...@freitas.net Date: Mon Apr 13 10:25:58 2015 -0400 handle NPE on number format instance --- src/org/torproject/android/service/TorService.java | 13 - 1 file changed, 8 insertions(+), 5 deletions(-)

[tor-commits] [orbot/master] fix NPE crash if VPN prepare Intent is null on boot

2015-04-15 Thread n8fr8
commit ec2442891590366b2c8a625551a92e74e9947393 Author: Nathan Freitas nat...@freitas.net Date: Mon Apr 13 10:24:03 2015 -0400 fix NPE crash if VPN prepare Intent is null on boot --- src/org/torproject/android/service/OnBootReceiver.java | 16 1 file changed, 8

[tor-commits] [translation/tor_animation] Update translations for tor_animation

2015-04-15 Thread translation
commit c0ab8d26621376df3995243b65d7edf0b5afd779 Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 12:15:52 2015 + Update translations for tor_animation --- ru.srt | 71 1 file changed, 36

[tor-commits] [tor-launcher/master] Bug 15657: display host:port if HOSTADDR is provided by Tor.

2015-04-15 Thread gk
commit b48d563eaa58b2c423b1eba09aa712787ba5a559 Author: Kathy Brade br...@pearlcrescent.com Date: Fri Apr 10 18:00:23 2015 -0400 Bug 15657: display host:port if HOSTADDR is provided by Tor. If a Tor bootstrap status message contains a HOSTADDR value, include it within the error

[tor-commits] [tor/master] Refactor router_rebuild_descriptor

2015-04-15 Thread nickm
commit 8feaf3846d67d80d6a1bae9867cdf55bafdc437e Author: Sebastian Hahn sebast...@torproject.org Date: Sat Feb 7 13:29:26 2015 +0100 Refactor router_rebuild_descriptor Allow building a router descriptor without storing it to global state. This is in preparation of a patch to

[tor-commits] [tor/master] Implement status/fresh-relay-descs command

2015-04-15 Thread nickm
commit 0c11d8b2d218b48ede19601bb7400639e3883a9c Author: Sebastian Hahn sebast...@torproject.org Date: Sun Feb 15 12:33:33 2015 +0100 Implement status/fresh-relay-descs command The idea here is that a controller should be able to make Tor produce a new relay descriptor on

[tor-commits] [tor/master] Merge remote-tracking branch 'sebastian/bug14784'

2015-04-15 Thread nickm
commit b98cc79477e5eb70284bb70dc80d778d5d082cc1 Merge: c3e8b7f 0c11d8b Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 15 11:10:37 2015 -0400 Merge remote-tracking branch 'sebastian/bug14784' changes/bug14784 |4 src/or/control.c | 43

[tor-commits] [tor/master] Remove spurious warn

2015-04-15 Thread nickm
commit 1a7dea9191585853fe9b3e591a98620c994111cf Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 15 11:04:17 2015 -0400 Remove spurious warn --- src/or/control.c |1 - 1 file changed, 1 deletion(-) diff --git a/src/or/control.c b/src/or/control.c index a34eb0d..fde3990 100644

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

2015-04-15 Thread translation
commit e9225ba3b57eb2f344f490295254d05e62097077 Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 15:45:38 2015 + Update translations for tails-misc --- id.po | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/id.po

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2015-04-15 Thread translation
commit 3a73f66bfb46c2ad5e51a06c6b8280fa01c1a7c6 Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 15:45:03 2015 + Update translations for bridgedb --- id/LC_MESSAGES/bridgedb.po |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug14391_026_v2'

2015-04-15 Thread nickm
commit 8837cc266e44f8033f32a7d1a05020e585f034c7 Merge: 7e6437b 91009dc Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 15 10:33:04 2015 -0400 Merge remote-tracking branch 'dgoulet/bug14391_026_v2' src/or/connection_edge.c | 59 +-

[tor-commits] [tor/master] changes file for 14391

2015-04-15 Thread nickm
commit 7e1fa9d63e7ef6d41b78280a73f86a0b17110dfd Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 15 10:34:19 2015 -0400 changes file for 14391 --- changes/bug14391 |5 + 1 file changed, 5 insertions(+) diff --git a/changes/bug14391 b/changes/bug14391 new file mode 100644

[tor-commits] [tor/master] Refactor rend_cache_lookup_entry() and how it's used

2015-04-15 Thread nickm
commit 91009dce971655f6b18b5eba5f0c0b48dbd8a737 Author: David Goulet dgou...@ev0ke.net Date: Mon Jan 26 17:42:42 2015 -0500 Refactor rend_cache_lookup_entry() and how it's used Here is why: 1) v0 descriptors are deprecated since 0.2.2.1 and not suppose to be alive in

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/fix-spaces-20150415'

2015-04-15 Thread nickm
commit eec58c35482d4425fccf38d632035319b56f795e Merge: 7e1fa9d af2b6bd Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 15 10:37:55 2015 -0400 Merge remote-tracking branch 'teor/fix-spaces-20150415' src/common/crypto.h |1 + src/test/test-memwipe.c |7 +-- 2 files

[tor-commits] [tor/master] Fix another space issue

2015-04-15 Thread nickm
commit c3e8b7f2da7f5c7fc4d341b533b7031eab90a665 Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 15 10:38:12 2015 -0400 Fix another space issue --- src/or/rendcommon.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c

[tor-commits] [tor/master] Fix spaces in crypto.h and test-memwipe.c

2015-04-15 Thread nickm
commit af2b6bdaba85d617f9eb93c67457f8b89b088b2d Author: teor teor2...@gmail.com Date: Wed Apr 15 19:42:41 2015 +1000 Fix spaces in crypto.h and test-memwipe.c --- src/common/crypto.h |1 + src/test/test-memwipe.c |7 +-- 2 files changed, 6 insertions(+), 2 deletions(-)

[tor-commits] [torspec/master] Remove note about wildcard transport; see #15612

2015-04-15 Thread nickm
commit a95724915096956ceff80856a4176f081660ca9c Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 15 10:53:31 2015 -0400 Remove note about wildcard transport; see #15612 --- pt-spec.txt |1 - 1 file changed, 1 deletion(-) diff --git a/pt-spec.txt b/pt-spec.txt index

[tor-commits] [tor/master] Fix indentation on a block

2015-04-15 Thread nickm
commit cc10f13408e25eaf04f849d0f761680f383fa61d Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 15 11:05:09 2015 -0400 Fix indentation on a block --- src/or/control.c | 76 +++--- 1 file changed, 38 insertions(+), 38 deletions(-)

[tor-commits] [spec/master] Merge pull request #38 from anadahz/test-spec/meek

2015-04-15 Thread art
commit d98e4edd3a9ae021247a0a7109c87775c5cd8d48 Merge: c01997f b230876 Author: Arturo Filastò art...@filasto.net Date: Wed Apr 15 19:05:04 2015 +0200 Merge pull request #38 from anadahz/test-spec/meek Add meek fronted requests test specification

[tor-commits] [spec/master] Add meek fronted requests test specification

2015-04-15 Thread art
commit b2308768e776189c385dffc5a394ec4bcfbb73cd Author: V auser@0 Date: Sun Apr 5 18:30:06 2015 +0200 Add meek fronted requests test specification --- test-specs/ts-013-meek_fronted_requests.md | 108 1 file changed, 108 insertions(+) diff --git

[tor-commits] [spec/master] fix typo

2015-04-15 Thread art
commit fac37d882ab48944f827b8855bdf94900e862d5e Author: Arturo Filastò art...@filasto.net Date: Wed Feb 4 13:27:05 2015 +0100 fix typo --- oonib.md |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oonib.md b/oonib.md index e653b02..88ab62a 100644 --- a/oonib.md +++

[tor-commits] [spec/master] Add informed consent text prepared by Dan O'Huiginn in https://lists.torproject.org/pipermail/ooni-dev/2015-January/000208.html

2015-04-15 Thread art
commit b2f5b1ccc4f76ebb7c0fb69c6a44992607ca6313 Author: Arturo Filastò a...@fuffa.org Date: Mon Mar 16 13:19:04 2015 +0100 Add informed consent text prepared by Dan O'Huiginn in https://lists.torproject.org/pipermail/ooni-dev/2015-January/000208.html ---

[tor-commits] [ooni-probe/master] 13602: build a binary of bin/ooniprobe that we can setcap on to avoid running as root

2015-04-15 Thread art
commit 7b01492e082550a0917bb9141601fdfdd41fd79f Author: Ximin Luo infini...@pwned.gg Date: Sun Mar 1 14:54:09 2015 +0100 13602: build a binary of bin/ooniprobe that we can setcap on to avoid running as root --- bin/Makefile | 81 +

[tor-commits] [spec/master] Fix markup of example

2015-04-15 Thread art
commit 93027244eeb36060fc4482073ad1ae0b676f5acd Author: Arturo Filastò art...@filasto.net Date: Fri Jan 16 17:53:52 2015 +0100 Fix markup of example --- test-specs/ts-006-header-field-manipulation.md | 226 +--- 1 file changed, 3 insertions(+), 223 deletions(-) diff

[tor-commits] [ooni-probe/master] Merge pull request #380 from infinity0/master

2015-04-15 Thread art
commit 4f8f1b154eba975636b47329179c79ed8370ceed Merge: 4fe2884 7b01492 Author: Arturo Filastò art...@filasto.net Date: Fri Apr 3 15:28:59 2015 +0200 Merge pull request #380 from infinity0/master 13602: build a binary of bin/ooniprobe that we can setcap on to avoid running as root

[tor-commits] [spec/master] test-helpers: Addressing comments from hellais in PR #32

2015-04-15 Thread art
commit 657aba53bc76849ba9cf32ee7133d8bebd2ab78e Author: Iain R. Learmonth i...@fsfe.org Date: Mon Dec 15 17:04:37 2014 + test-helpers: Addressing comments from hellais in PR #32 * Corrected vocabulary for the OONI naming conventions * Added a security considerations

[tor-commits] [spec/master] Add long informed consent page

2015-04-15 Thread art
commit aa3f22c0701f583a6af3198a5980610322cca45b Author: Arturo Filastò a...@fuffa.org Date: Mon Mar 16 13:31:19 2015 +0100 Add long informed consent page --- informed-consent/inform-users-long.md | 14 ++ 1 file changed, 14 insertions(+) diff --git

[tor-commits] [spec/master] Fix meek test spec (PR #38)

2015-04-15 Thread art
commit 45d28710b40effd941fd0af989b6de8cc532747d Author: anadahz kojg...@inbox.com Date: Thu Apr 9 01:46:57 2015 +0200 Fix meek test spec (PR #38) --- test-specs/ts-013-meek_fronted_requests.md | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git

[tor-commits] [spec/master] Merge pull request #35 from irl/master

2015-04-15 Thread art
commit 902a1ae6c0857f51d172dfc299278541970d1f01 Merge: 87957c3 de49e3f Author: Arturo Filastò art...@filasto.net Date: Wed Mar 25 11:54:18 2015 +0100 Merge pull request #35 from irl/master Added reverse traceroute test helper specification

[tor-commits] [spec/master] Merge pull request #37 from TheTorProject/feature/report_id_test_helpers

2015-04-15 Thread art
commit c01997fa17dd21ed7e2d3865576f025d8012d90d Merge: 902a1ae e21e84c Author: Arturo Filastò art...@filasto.net Date: Fri Mar 27 11:40:55 2015 +0100 Merge pull request #37 from TheTorProject/feature/report_id_test_helpers Add test_helpers and report_id keys to report header

[tor-commits] [spec/master] Add test_helpers and report_id keys to report header

2015-04-15 Thread art
commit e21e84c736141955852dcd4bfcaa9b8a3e9feb04 Author: Arturo Filastò a...@fuffa.org Date: Wed Mar 25 11:52:53 2015 +0100 Add test_helpers and report_id keys to report header --- data-formats/df-000-base.md | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git

[tor-commits] [spec/master] Merge pull request #36 from TheTorProject/feature/informed-consent

2015-04-15 Thread art
commit 87957c30924ef9be56d7614b87fc5ab03d59b18f Merge: fac37d8 897132e Author: Arturo Filastò art...@filasto.net Date: Mon Mar 16 17:29:06 2015 +0100 Merge pull request #36 from TheTorProject/feature/informed-consent Feature/informed consent informed-consent/inform-users-long.md

[tor-commits] [spec/master] Fix issues identified by @bassosimone

2015-04-15 Thread art
commit 897132ef41c4e4201e4fcee4b370cab213725f9a Author: Arturo Filastò a...@fuffa.org Date: Mon Mar 16 16:45:14 2015 +0100 Fix issues identified by @bassosimone --- informed-consent/inform-users-long.md | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git

[tor-commits] [spec/master] Add DNS Injection test

2015-04-15 Thread art
commit f536f4cf33bd2fef2854b8654abc1319a063979b Author: Arturo Filastò a...@fuffa.org Date: Tue Dec 9 12:01:26 2014 +0100 Add DNS Injection test --- test-specs/ts-012-dns-injection.md | 150 1 file changed, 150 insertions(+) diff --git

[tor-commits] [spec/master] Update data format with recent changes to it.

2015-04-15 Thread art
commit 73aa34f1123af603fab00d00b5cd1806c9152c45 Author: Arturo Filastò a...@fuffa.org Date: Fri Oct 17 10:32:45 2014 +0200 Update data format with recent changes to it. --- data-formats/df-000-base.md |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

[tor-commits] [spec/master] Initial import of taw TCP and UDP echo helpers

2015-04-15 Thread art
commit d04ab0477ae4feb9e038f99661b677f3d01c1289 Author: Iain R. Learmonth i...@fsfe.org Date: Mon Dec 8 15:45:21 2014 + Initial import of taw TCP and UDP echo helpers --- test-helpers/th-004-raw-tcp-echo.md | 67 +++ test-helpers/th-005-raw-udp-echo.md

[tor-commits] [spec/master] Merge branch 'master' of github.com:TheTorProject/ooni-spec

2015-04-15 Thread art
commit 9ad8dca517efce0c669c39fffe5672c6d66f604a Merge: e651ae7 4525ff6 Author: Arturo Filastò a...@fuffa.org Date: Tue Oct 14 12:37:06 2014 +0200 Merge branch 'master' of github.com:TheTorProject/ooni-spec * 'master' of github.com:TheTorProject/ooni-spec: Improved

[tor-commits] [spec/master] Merge pull request #34 from irl/master

2015-04-15 Thread art
commit e25a2af54d6b557f8e45b1abc76d4dc01cf6620b Merge: b0591bd 657aba5 Author: Arturo Filastò art...@filasto.net Date: Mon Dec 15 18:34:50 2014 +0100 Merge pull request #34 from irl/master test-helpers: Addressing comments from hellais in PR #32

[tor-commits] [spec/master] Added reverse traceroute specification

2015-04-15 Thread art
commit de49e3fab389d484f286e3ea87bc9e35cae62f4e Author: Iain R. Learmonth i...@fsfe.org Date: Thu Jan 15 14:57:33 2015 + Added reverse traceroute specification --- test-helpers/th-006-reverse-traceroute.md | 52 + 1 file changed, 52 insertions(+) diff

[tor-commits] [spec/master] Make some changes to the wording of some of the texts

2015-04-15 Thread art
commit f5ee53e52ffb450acca5905770dc897dc1fa7759 Author: Arturo Filastò a...@fuffa.org Date: Mon Mar 16 13:24:20 2015 +0100 Make some changes to the wording of some of the texts --- informed-consent/inform-users-long.md | 22 ++ informed-consent/inform-users-short.md

[tor-commits] [spec/master] Merge pull request #31 from kudrom/feature/updated_oonib_policy_aware

2015-04-15 Thread art
commit 4525ff6ba4fa9f7f264a7dd46955dc26c36d78c0 Merge: abd539e 197063b Author: Arturo Filastò art...@filasto.net Date: Mon Sep 1 12:32:18 2014 +0200 Merge pull request #31 from kudrom/feature/updated_oonib_policy_aware Review of policy aware changes oonib.md | 70

[tor-commits] [spec/master] Merge pull request #33 from TheTorProject/feature/dns_injection

2015-04-15 Thread art
commit 8ee0cef1af7cb1c9cc7709936f226841be28c498 Merge: f90fd4a f536f4c Author: Arturo Filastò art...@filasto.net Date: Tue Dec 9 12:24:42 2014 +0100 Merge pull request #33 from TheTorProject/feature/dns_injection Add DNS Injection test test-specs/ts-012-dns-injection.md | 150

[tor-commits] [spec/master] Rename meek test for naming consistency

2015-04-15 Thread art
commit 84b8d1cafa42802ef98caad3013f870db7a62a25 Author: Arturo Filastò a...@fuffa.org Date: Wed Apr 15 19:09:54 2015 +0200 Rename meek test for naming consistency --- test-specs/ts-013-meek-fronted-requests.md | 111 test-specs/ts-013-meek_fronted_requests.md

[tor-commits] [spec/master] Remove not used test_method

2015-04-15 Thread art
commit f90fd4a2965177431264b4c441de7d872e4381c7 Author: Arturo Filastò a...@fuffa.org Date: Fri Oct 17 11:05:40 2014 +0200 Remove not used test_method --- data-formats/df-000-base.md |4 1 file changed, 4 deletions(-) diff --git a/data-formats/df-000-base.md

[tor-commits] [spec/master] Merge pull request #32 from irl/master

2015-04-15 Thread art
commit b0591bd0fc64c2029e38d16ecba940e8f6b15965 Merge: 8ee0cef d04ab04 Author: Arturo Filastò art...@filasto.net Date: Thu Dec 11 23:26:06 2014 +0100 Merge pull request #32 from irl/master Initial import of raw TCP and UDP echo helpers test-helpers/th-004-raw-tcp-echo.md | 67

[tor-commits] [spec/master] Improved RESTfulness of the bouncer API.

2015-04-15 Thread art
commit 197063b7afca942374f6c0ae3c4f66995cb285ff Author: kudrom kud...@riseup.net Date: Fri Aug 29 15:59:49 2014 +0200 Improved RESTfulness of the bouncer API. --- oonib.md | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/oonib.md b/oonib.md index

[tor-commits] [spec/master] Review of policy aware changes

2015-04-15 Thread art
commit 65c049b0217493193477ee2545f2b7a47f8e01f1 Author: kudrom kud...@riseup.net Date: Mon Aug 25 23:32:58 2014 +0200 Review of policy aware changes --- oonib.md | 72 ++ 1 file changed, 68 insertions(+), 4 deletions(-) diff

[tor-commits] [spec/master] Update release procedure with ooniinput and ooniresources commands.

2015-04-15 Thread art
commit e651ae72392ee7edebdad5e33ea94c6b15850b5a Author: Arturo Filastò a...@fuffa.org Date: Thu Oct 9 09:34:41 2014 +0200 Update release procedure with ooniinput and ooniresources commands. --- Release-Procedure.md | 16 1 file changed, 16 insertions(+) diff --git

[tor-commits] [obfs4/master] Use a built in SOCKS 5 server instead of goptlibs.

2015-04-15 Thread yawning
commit a8d7134f1097bd50803da0e2a86c07524e433b51 Author: Yawning Angel yawn...@torproject.org Date: Sun Apr 12 19:00:46 2015 + Use a built in SOCKS 5 server instead of goptlibs. Differences from my goptlib branch: * Instead of exposing a net.Listener, just expose a

[tor-commits] [obfs4/master] Do the release ritual for obfs4proxy-0.0.5.

2015-04-15 Thread yawning
commit 3540313e53fc851c833d98281fd64c8fd32effeb Author: Yawning Angel yawn...@torproject.org Date: Wed Apr 15 20:54:07 2015 + Do the release ritual for obfs4proxy-0.0.5. --- ChangeLog|2 +- obfs4proxy/obfs4proxy.go |2 +- 2 files changed, 2 insertions(+), 2

[tor-commits] [tor-launcher/master] Bug 13576: Tor Launcher strips bridge from the middle of bridge lines

2015-04-15 Thread gk
commit 78f505c2139341e71538e77a975f7df9f81189d0 Author: Kathy Brade br...@pearlcrescent.com Date: Thu Mar 26 14:42:20 2015 -0400 Bug 13576: Tor Launcher strips bridge from the middle of bridge lines Change the code that strips bridge to work on a line-by-line basis. Do not add

[tor-commits] [tor-launcher/master] Merge branch 'bug13576-01'

2015-04-15 Thread gk
commit a37371ac9a866612e91a791251104184caad41ca Merge: b48d563 78f505c Author: Georg Koppen g...@torproject.org Date: Wed Apr 15 20:01:36 2015 + Merge branch 'bug13576-01' src/chrome/content/network-settings-overlay.xul |5 ++--- src/chrome/content/network-settings.js |

[tor-commits] [translation/tor_animation] Update translations for tor_animation

2015-04-15 Thread translation
commit 85dba5fa12f16ebee63b230eee316b4db8a93fd5 Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 19:15:55 2015 + Update translations for tor_animation --- id.srt | 92 1 file changed, 46

[tor-commits] [translation/tor_animation_completed] Update translations for tor_animation_completed

2015-04-15 Thread translation
commit 102973ff9d175cada930280f5ba0ef8fd4129cd5 Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 19:46:01 2015 + Update translations for tor_animation_completed --- id.srt | 164 1 file changed,

[tor-commits] [translation/tor_animation] Update translations for tor_animation

2015-04-15 Thread translation
commit ac598de11234d40a3aa3d39e650b3774cc1dc093 Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 19:45:58 2015 + Update translations for tor_animation --- id.srt | 27 +-- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git

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

2015-04-15 Thread translation
commit c366416819657709a55181d559b54b7edb1f0c1f Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 19:45:33 2015 + Update translations for tor-launcher-network-settings --- id/network-settings.dtd |8 1 file changed, 4 insertions(+), 4 deletions(-)

[tor-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers.

2015-04-15 Thread mikeperry
commit 44cd9b47cb74544aa6eac4b1b0f3d4474457c3dc Author: Georg Koppen g...@torproject.org Date: Tue Apr 14 10:27:02 2015 + fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers. --- netwerk/protocol/http/nsHttpConnectionInfo.cpp |5 + 1 file

[tor-commits] [bridgedb/develop] Merge branch 'fix/12505-5418-remove-old-block-code' into develop

2015-04-15 Thread isis
commit 91f4cf9c084765748fed80f8f8d00eae80c5e68e Merge: 7a1a54f 5e032ef Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 1 06:13:21 2015 + Merge branch 'fix/12505-5418-remove-old-block-code' into develop lib/bridgedb/Bridges.py | 72

[tor-commits] [bridgedb/develop] Improve documentation for b.bridgerequest.BridgeRequestBase attributes.

2015-04-15 Thread isis
commit 33656cd687eb74874eb52ed28a65b7704fd78262 Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 1 05:51:17 2015 + Improve documentation for b.bridgerequest.BridgeRequestBase attributes. --- lib/bridgedb/bridgerequest.py | 11 +-- 1 file changed, 9 insertions(+), 2

[tor-commits] [bridgedb/develop] Remove all remnants of #5027/#5418 bridge block parser code.

2015-04-15 Thread isis
commit 5e032efa39a4c00f00ca2f86460f952bf2c081a8 Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 1 01:04:33 2015 + Remove all remnants of #5027/#5418 bridge block parser code. * REMOVES bridgedb.Bridges.re_ipv4. * REMOVES bridgedb.Bridges.re_ipv6. * REMOVES

[tor-commits] [bridgedb/develop] Fix missing random module import to bridgedb.test.util.

2015-04-15 Thread isis
commit 4ff20fd52aab80958e3c3f2af0908e003d907761 Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 1 06:31:37 2015 + Fix missing random module import to bridgedb.test.util. --- lib/bridgedb/test/util.py |1 + 1 file changed, 1 insertion(+) diff --git

[tor-commits] [bridgedb/develop] Fix documentation for `key` parameter in IPBasedDistributor.

2015-04-15 Thread isis
commit a43a05802c108292f26c9bc1bc959d5cfb3b62dc Author: Isis Lovecruft i...@torproject.org Date: Tue Apr 14 07:36:28 2015 + Fix documentation for `key` parameter in IPBasedDistributor. Conflicts: lib/bridgedb/Dist.py --- lib/bridgedb/Dist.py |6 +++--- 1 file

[tor-commits] [bridgedb/develop] PEP8 and Sphinx documentation fixes for bridgedb.geo.getCountryCode().

2015-04-15 Thread isis
commit 6a3ca67a7119f0958c23298aa6b3fceeb4ad4271 Author: Isis Lovecruft i...@torproject.org Date: Thu Apr 2 21:42:18 2015 + PEP8 and Sphinx documentation fixes for bridgedb.geo.getCountryCode(). --- lib/bridgedb/geo.py | 28 1 file changed, 16

[tor-commits] [bridgedb/develop] Rewrite `python setyp.py test` code to run Trial tests only.

2015-04-15 Thread isis
commit 382a4f5e54a26dc7a2179d17cb4129f68e3e650e Author: Isis Lovecruft i...@torproject.org Date: Thu Apr 16 04:23:24 2015 + Rewrite `python setyp.py test` code to run Trial tests only. --- lib/bridgedb/parse/options.py | 27 -- lib/bridgedb/runner.py| 47

[tor-commits] [bridgedb/develop] Print each log line from get-tor-exits to it's own line in our log.

2015-04-15 Thread isis
commit 63bd41f58ca2e4fe4b008fcba12739590e3c3b2c Author: Isis Lovecruft i...@torproject.org Date: Thu Apr 2 05:08:38 2015 + Print each log line from get-tor-exits to it's own line in our log. --- lib/bridgedb/proxy.py |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff

[tor-commits] [bridgedb/develop] Add missing ipaddr module to bridgedb.test.util.

2015-04-15 Thread isis
commit 7a1a54fdb1f980afb0c791f26dc5c4b851db32a5 Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 1 06:08:55 2015 + Add missing ipaddr module to bridgedb.test.util. --- lib/bridgedb/test/util.py |1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/test/util.py

[tor-commits] [bridgedb/develop] Don't log special/private attributes when logging changed configuration.

2015-04-15 Thread isis
commit 584d5911df5318caeabc5b57a0b480dc10d211e9 Author: Isis Lovecruft i...@torproject.org Date: Thu Apr 2 05:05:28 2015 + Don't log special/private attributes when logging changed configuration. --- lib/bridgedb/configure.py |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

[tor-commits] [bridgedb/develop] Decrease insane ammounts of logging for adding proxies to ProxySet.

2015-04-15 Thread isis
commit 5d8f47943c78f87821d6102a72fe321a3fce8b39 Author: Isis Lovecruft i...@torproject.org Date: Thu Apr 2 05:07:58 2015 + Decrease insane ammounts of logging for adding proxies to ProxySet. --- lib/bridgedb/proxy.py |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff

[tor-commits] [bridgedb/develop] Fix docs for BridgeBackwardsCompatibility.getConfigLine() request param.

2015-04-15 Thread isis
commit c79290e0b009fdcd303961910db7ddcf0627c32f Author: Isis Lovecruft i...@torproject.org Date: Tue Apr 14 07:37:06 2015 + Fix docs for BridgeBackwardsCompatibility.getConfigLine() request param. --- lib/bridgedb/bridges.py |8 1 file changed, 4 insertions(+), 4

[tor-commits] [bridgedb/develop] Remove duplicate doctest runs for some modules.

2015-04-15 Thread isis
commit 016b6e2ea26c0444bda6074087032d0d42bf7a02 Author: Isis Lovecruft i...@torproject.org Date: Tue Apr 14 08:54:58 2015 + Remove duplicate doctest runs for some modules. --- lib/bridgedb/test/legacy_Tests.py |8 1 file changed, 8 deletions(-) diff --git

[tor-commits] [bridgedb/develop] Move N_IP_CLUSTERS into the HTTPS distributor-specific settings.

2015-04-15 Thread isis
commit 70009a726f6076036f29909fc5476ae4cc94fd2d Author: Isis Lovecruft i...@torproject.org Date: Thu Apr 2 01:32:45 2015 + Move N_IP_CLUSTERS into the HTTPS distributor-specific settings. --- bridgedb.conf | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git

[tor-commits] [bridgedb/develop] Add an extra newline after email footers to avoid looking too busy.

2015-04-15 Thread isis
commit efc3fdda61544360466a6882f0fb4a86d1e4abdc Author: Isis Lovecruft i...@torproject.org Date: Thu Apr 2 05:07:12 2015 + Add an extra newline after email footers to avoid looking too busy. --- lib/bridgedb/email/templates.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] Merge remote-tracking branch 'arthur/13875' into tor-browser-31.6.0esr-4.5-1

2015-04-15 Thread mikeperry
commit 4c5a59914a15fa0795575f1f0b9ebe957bc52c65 Merge: 1a6eb58 a5648c8 Author: Mike Perry mikeperry-...@torproject.org Date: Wed Apr 15 18:41:42 2015 -0700 Merge remote-tracking branch 'arthur/13875' into tor-browser-31.6.0esr-4.5-1 dom/base/nsGlobalWindow.cpp | 11 --- 1 file

[tor-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug #5856: Do not expose physical screen info via window window.screen.

2015-04-15 Thread mikeperry
commit a5648c8d80f396caf294d761cc4a9a76c0b33a9d Author: Arthur Edelstein arthuredelst...@gmail.com Date: Wed Apr 8 22:55:41 2015 -0700 fixup! Bug #5856: Do not expose physical screen info via window window.screen. --- dom/base/nsGlobalWindow.cpp | 11 --- 1 file changed, 8

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

2015-04-15 Thread translation
commit 737e0db0b6501c2249b640a2b513ac0dfdd17ca0 Author: Translation commit bot translat...@torproject.org Date: Thu Apr 16 00:46:00 2015 + Update translations for torbutton-torbuttonproperties --- ro/torbutton.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[tor-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] Revert TB1: Add a string-based cacheKey.

2015-04-15 Thread mikeperry
commit 5ad57a0b24c85d19427eddebc2f647296063acfd Author: Mike Perry mikeperry-...@torproject.org Date: Wed Apr 15 22:07:27 2015 -0700 Revert TB1: Add a string-based cacheKey. This reverts commit 53f8f2506cb21bf1847a4261ef383db9be55a93c. This used to be used by

[tor-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.

2015-04-15 Thread mikeperry
commit 1a6eb58a1d3cab67e371ac861d04ba526d4e6751 Author: Georg Koppen g...@torproject.org Date: Tue Apr 14 10:31:39 2015 + fixup! TB4: Tor Browser's Firefox preference overrides. We remove the keep-alive restriction now that we have isolation to the URL bar domain which is

[tor-commits] [translation/tor_animation] Update translations for tor_animation

2015-04-15 Thread translation
commit 2b6c7de715abd4bdbea9607cd6fafc9f514a10d2 Author: Translation commit bot translat...@torproject.org Date: Thu Apr 16 03:15:54 2015 + Update translations for tor_animation --- id.srt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id.srt b/id.srt index

[tor-commits] [translation/tor_animation_completed] Update translations for tor_animation_completed

2015-04-15 Thread translation
commit 2a7e96790608928174e4be5fe7e573f6e961bf32 Author: Translation commit bot translat...@torproject.org Date: Thu Apr 16 03:16:02 2015 + Update translations for tor_animation_completed --- id.srt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id.srt b/id.srt

[tor-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] Merge remote-tracking branch 'gk/bug_10761_v2' into tor-browser-31.6.0esr-4.5-1

2015-04-15 Thread mikeperry
commit e1a8bafb44367592bc982c2a65752ec439b515a6 Merge: 5ad57a0 c9944b9c Author: Mike Perry mikeperry-...@torproject.org Date: Wed Apr 15 22:16:33 2015 -0700 Merge remote-tracking branch 'gk/bug_10761_v2' into tor-browser-31.6.0esr-4.5-1 security/nss/coreconf/WIN32.mk |5 + 1 file

[tor-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] Bug 10761: Fix shutdown crashes on Windows

2015-04-15 Thread mikeperry
commit c9944b9ca97a238304b61e822d7509ec4ac85a12 Author: Georg Koppen g...@torproject.org Date: Mon Apr 6 07:47:41 2015 + Bug 10761: Fix shutdown crashes on Windows Jacek Caban gave us this patch which should fix the shutdown crashes on Windows (#10761 and #14454) as newer

[tor-commits] [tor-messenger-build/master] Update installer.patch for copying cert_override file

2015-04-15 Thread sukhbir
commit 78f0389f24db0fff49bbb3ca8cb1fccfaaf2e0d5 Author: Sukhbir Singh sukh...@torproject.org Date: Wed Apr 15 02:18:31 2015 -0400 Update installer.patch for copying cert_override file --- projects/instantbird/installer.patch |8 1 file changed, 4 insertions(+), 4 deletions(-)

[tor-commits] [tor-messenger-build/master] Initialize Tor Messenger branding

2015-04-15 Thread sukhbir
commit b76fa5f9ca482edd8dbee2a07e388279b08fa416 Author: Sukhbir Singh sukh...@torproject.org Date: Wed Apr 15 04:18:06 2015 -0400 Initialize Tor Messenger branding --- projects/instantbird/build |2 ++ projects/instantbird/mozconfig-linux-i686 |2 ++

[tor-commits] [tor-messenger-build/master] Create branding before applying the patches

2015-04-15 Thread sukhbir
commit e53475552105e92c67a3718341879555a9cbd25e Author: Sukhbir Singh sukh...@torproject.org Date: Wed Apr 15 07:11:10 2015 -0400 Create branding before applying the patches --- projects/instantbird/build |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git

[tor-commits] [translation/tor_animation] Update translations for tor_animation

2015-04-15 Thread translation
commit 80c24a8d35ba9ae4dc5a884b1160f6e2537da21e Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 11:15:54 2015 + Update translations for tor_animation --- ru.srt | 32 1 file changed, 16 insertions(+), 16 deletions(-) diff

[tor-commits] [translation/tor_animation] Update translations for tor_animation

2015-04-15 Thread translation
commit 05198c5939f317264fb4932e2181145c69aabfe6 Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 11:45:52 2015 + Update translations for tor_animation --- ru.srt | 17 - 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/ru.srt