[tor-commits] [meek/extension] Log meek-client-torbrowser output to a file.

commit d9734e12cc51788bfa8310b519dd06c4cee9dd42 Author: David Fifield da...@bamsoftware.com Date: Mon Apr 7 23:34:14 2014 -0700 Log meek-client-torbrowser output to a file. --- meek-client-torbrowser/main.go |7 +++ 1 file changed, 7 insertions(+) diff --git

[tor-commits] [meek/extension] Don't inherit stdin.

commit e4c566c24041d22d869485c104f06e9ddd0ff5d8 Author: David Fifield da...@bamsoftware.com Date: Tue Apr 8 00:40:58 2014 -0700 Don't inherit stdin. --- processterminate-buffer/main.go |9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git

[tor-commits] [meek/extension] Add processterminate-buffer program.

commit 82a68236b1a150961d777ef9073044c88a9f9aa4 Author: David Fifield da...@bamsoftware.com Date: Mon Apr 7 23:24:17 2014 -0700 Add processterminate-buffer program. This program insulates a transport plugin from tor on Windows, so that the transport plugin can clean up after

[tor-commits] [meek/extension] Synthesize a SIGTERM on stdin close.

commit 8611e7da4bd50d2849daeabe0013576117ae613e Author: David Fifield da...@bamsoftware.com Date: Mon Apr 7 23:30:12 2014 -0700 Synthesize a SIGTERM on stdin close. --- meek-client-torbrowser/main.go | 12 1 file changed, 12 insertions(+) diff --git

[tor-commits] [meek/extension] fmt.

commit 2922b23f1ec5148ef05f8fa959ddb182af3b5516 Author: David Fifield da...@bamsoftware.com Date: Tue Apr 8 01:34:04 2014 -0700 fmt. --- meek-client-torbrowser/main.go |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meek-client-torbrowser/main.go

[tor-commits] [meek/extension] Oops, stdin, not stdout.

commit 5eeb8439d64c36971da3717b4163c8220f74a164 Author: David Fifield da...@bamsoftware.com Date: Tue Apr 8 01:43:12 2014 -0700 Oops, stdin, not stdout. --- meek-client-torbrowser/main.go |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meek-client-torbrowser/main.go

[tor-commits] [meek/extension] The function is called TerminateProcess, not ProcessTerminate.

commit 634c6236d9fbc3471d9561e1d534f326308e536f Author: David Fifield da...@bamsoftware.com Date: Tue Apr 8 02:22:58 2014 -0700 The function is called TerminateProcess, not ProcessTerminate. --- .gitignore |2 +- meek-client-torbrowser/main.go |2 +-

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

commit a5847d8fb3ccfe6596e44d065ce4cc88acf32943 Author: Translation commit bot translat...@torproject.org Date: Tue Apr 8 13:45:30 2014 + Update translations for tor-launcher-properties --- fr_CA/torlauncher.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

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

commit 41edfaf7e31eccb887949f90ded348884467d735 Author: Translation commit bot translat...@torproject.org Date: Tue Apr 8 13:45:33 2014 + Update translations for tor-launcher-properties_completed --- fr_CA/torlauncher.properties |1 + 1 file changed, 1 insertion(+) diff --git

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

commit 66721b0ac3cc745b59fcdd1ee4b30e4b26fa21db Author: Translation commit bot translat...@torproject.org Date: Tue Apr 8 13:15:29 2014 + Update translations for tor-launcher-properties --- pt_BR/torlauncher.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

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

commit 40c2bdea60c63ee42f789e1f03488c91b258b400 Author: Translation commit bot translat...@torproject.org Date: Tue Apr 8 13:15:34 2014 + Update translations for tor-launcher-properties_completed --- pt_BR/torlauncher.properties |1 + 1 file changed, 1 insertion(+) diff --git

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

commit ae04c2737a749cbc69dfb76b37da2af4a2472a79 Author: Translation commit bot translat...@torproject.org Date: Tue Apr 8 12:16:18 2014 + Update translations for tor-launcher-properties_completed --- de/torlauncher.properties |1 + en/torlauncher.properties |1 +

[tor-commits] [bridgedb/develop] Remove extra EOF newline from bridgedb.Util.

commit 309d098ee2fa00451d9062cb5e28be81b556174e Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 2 14:16:41 2014 + Remove extra EOF newline from bridgedb.Util. --- lib/bridgedb/Util.py |1 - 1 file changed, 1 deletion(-) diff --git a/lib/bridgedb/Util.py

[tor-commits] [bridgedb/develop] Add file headers and module docstring to bridgedb.Util.

commit cc2aab80c9b955ab888b8ee7e7ecae72bd1bd713 Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 2 14:16:18 2014 + Add file headers and module docstring to bridgedb.Util. --- lib/bridgedb/Util.py | 13 + 1 file changed, 13 insertions(+) diff --git

[bridgedb/develop] Move bridgedb.Util → bridgedb.util.

commit d8088ca7a6955dc0c528092faaf135817fa28dc2 Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 2 14:36:39 2014 + Move bridgedb.Util → bridgedb.util. --- doc/sphinx/source/bridgedb.Util.rst |6 +++--- doc/sphinx/source/bridgedb.rst |3 ++-

[tor-commits] [bridgedb/develop] Fix formatting of file headers and module docstring for bridgedb.Dist.

commit 9a2f3bcde37a5ee7dee22f1455ceff27978c4ced Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 2 14:21:03 2014 + Fix formatting of file headers and module docstring for bridgedb.Dist. --- lib/bridgedb/Dist.py | 20 +--- 1 file changed, 13 insertions(+), 7

[tor-commits] [bridgedb/develop] Add linked header in sphinx source for bridgedb.captcha.

commit 747ba6330e060acf9112177ba07fc2017bd46595 Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 2 19:27:57 2014 + Add linked header in sphinx source for bridgedb.captcha. --- doc/sphinx/source/bridgedb.captcha.rst |2 ++ 1 file changed, 2 insertions(+) diff --git

[tor-commits] [bridgedb/develop] PEP8 whitespace fix for one inline comment in bridgedb.Main.

commit 0639cd71f792be9c119e52ae622707d388bea83b Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 2 14:55:57 2014 + PEP8 whitespace fix for one inline comment in bridgedb.Main. --- lib/bridgedb/Main.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [bridgedb/develop] Fix a bug in bridgedb.Bridges due to catching a non-existent exception.

commit 88e6aeaed8c55362739550561369a50bdddbed33 Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 2 12:06:52 2014 + Fix a bug in bridgedb.Bridges due to catching a non-existent exception. --- lib/bridgedb/Bridges.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[tor-commits] [bridgedb/develop] PEP8 cleanup import lines in EmailServer.

commit d49fe1dcaddbaf67b98ad9b5b3e19fb68379ccf4 Author: Isis Lovecruft i...@torproject.org Date: Sun Apr 6 22:28:15 2014 + PEP8 cleanup import lines in EmailServer. --- lib/bridgedb/EmailServer.py | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git

[tor-commits] [bridgedb/develop] Remove old gen_bridge_descriptors docs from sphinx build configs.

commit f96b6c4a3dfc04748f9959fedd274ecb3aabc6cc Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 2 14:38:04 2014 + Remove old gen_bridge_descriptors docs from sphinx build configs. --- doc/sphinx/source/bridgedb.rst |1 - doc/sphinx/source/conf.py

[tor-commits] [bridgedb/develop] Add sphinx build source for bridgedb.txrecaptcha module.

commit 2f97b58b24d584d6b14f98941d2ebd6f6287c19d Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 2 14:43:39 2014 + Add sphinx build source for bridgedb.txrecaptcha module. --- doc/sphinx/source/bridgedb.txrecaptcha.rst |9 + doc/sphinx/source/conf.py

[tor-commits] [bridgedb/develop] Remove overzealous logging of config updates in bridgedb.Main.

commit c047582df068617a2d813d3716992e6f69e763f6 Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 2 14:56:36 2014 + Remove overzealous logging of config updates in bridgedb.Main. --- lib/bridgedb/Main.py |5 - 1 file changed, 5 deletions(-) diff --git

[tor-commits] [bridgedb/develop] PEP8 for EmailServer module docstring.

commit d2a7b9376309db490091f6c7b1869acb8b7f3586 Author: Isis Lovecruft i...@torproject.org Date: Sun Apr 6 20:39:50 2014 + PEP8 for EmailServer module docstring. --- lib/bridgedb/EmailServer.py |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git

[tor-commits] [bridgedb/develop] Remove another pprint from a logging call in bridgedb.Main.

commit 6c836322fe8edc9711194dc8b5d51c8e8e8f6194 Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 2 14:57:12 2014 + Remove another pprint from a logging call in bridgedb.Main. --- lib/bridgedb/Main.py |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git

[tor-commits] [bridgedb/develop] Add file headers and fix module docstring for bridgedb.Bridges.

commit 8c04ac62954e99de131ac9b409412aeda3ac1c12 Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 2 12:06:17 2014 + Add file headers and fix module docstring for bridgedb.Bridges. --- lib/bridgedb/Bridges.py | 15 ++- 1 file changed, 10 insertions(+), 5

[tor-commits] [bridgedb/develop] Change PTTBB link to TBB-3.6-beta-1 download page.

commit 8e0d3a955c4130c7e3d6c44b1f053a4e2ffd51de Author: Isis Lovecruft i...@torproject.org Date: Sun Apr 6 20:34:31 2014 + Change PTTBB link to TBB-3.6-beta-1 download page. * CHANGE link text to call it Tor Browser Bundle, due to PTTBB and TBB being unified into the

[tor-commits] [bridgedb/develop] Update bridgedb.runner.generateDescriptors to mention leekspin.

commit a2f59909bdde9f5c31f1282ad028184eb3fe0a72 Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 2 14:41:40 2014 + Update bridgedb.runner.generateDescriptors to mention leekspin. --- lib/bridgedb/runner.py | 19 ++- 1 file changed, 10 insertions(+), 9

[tor-commits] [bridgedb/develop] Use Dist.* instead of bridgedb.Dist.* in EmailServer.getMailResponse().

commit b21fc1dad202f300314fb84347da356c5bfac195 Author: Isis Lovecruft i...@torproject.org Date: Wed Feb 12 15:24:53 2014 + Use Dist.* instead of bridgedb.Dist.* in EmailServer.getMailResponse(). --- lib/bridgedb/EmailServer.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [bridgedb/develop] Use `from` import syntax for twisted.mail.smtp in EmailServer.

commit 32689e0d4f83506b867dcbf793cc757717acfdb5 Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 00:14:41 2014 + Use `from` import syntax for twisted.mail.smtp in EmailServer. --- lib/bridgedb/EmailServer.py | 19 +-- 1 file changed, 9 insertions(+), 10

[tor-commits] [bridgedb/develop] Remove duplicate log statement from EmailServer.replyToMail().

commit 3f0e105d554191878579f15ea40ca3f452cadbbc Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 02:49:21 2014 + Remove duplicate log statement from EmailServer.replyToMail(). --- lib/bridgedb/EmailServer.py |1 - 1 file changed, 1 deletion(-) diff --git

[tor-commits] [bridgedb/develop] Remove unused import ConnectionRefusedError in EmailServer.

commit ff8c8cd30ca214b9e4050f998a1e09809241f8b8 Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 00:10:21 2014 + Remove unused import ConnectionRefusedError in EmailServer. --- lib/bridgedb/EmailServer.py |1 - 1 file changed, 1 deletion(-) diff --git

[tor-commits] [bridgedb/develop] Fix old-style class EmailServer.MailContext.

commit b0157d695ef55692de163f92eccf6d65d50bec8b Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 02:50:53 2014 + Fix old-style class EmailServer.MailContext. --- lib/bridgedb/EmailServer.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [bridgedb/develop] Import `defer` rather than `Deferred` in EmailServer.

commit 85d34853512c9b8a2227e5026c9a60aa537260ef Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 00:08:56 2014 + Import `defer` rather than `Deferred` in EmailServer. --- lib/bridgedb/EmailServer.py |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

[tor-commits] [bridgedb/develop] Fix old-style class EmailServer.MailMessage.

commit ceb050f7aa5576b838621164f658d9d8a0f4ca4a Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 02:45:16 2014 + Fix old-style class EmailServer.MailMessage. --- lib/bridgedb/EmailServer.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [bridgedb/develop] Change import of `random.randint`; only use one random value to create IP.

commit 4bc1ffb742c66502cd5fde3e57709bae0d462f71 Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 03:07:46 2014 + Change import of `random.randint`; only use one random value to create IP. --- lib/bridgedb/HTTPServer.py |6 +++--- 1 file changed, 3 insertions(+), 3

[tor-commits] [bridgedb/develop] Remove banal truism from EmailServer.MailMessage docstring.

commit 0eecc001dc6f00a90108385bd01b541638d464a0 Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 02:47:40 2014 + Remove banal truism from EmailServer.MailMessage docstring. --- lib/bridgedb/EmailServer.py |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git

[tor-commits] [bridgedb/develop] PEP8 add newline after class docstring in EmailServer.

commit 75870e70da6ae81f26581e2ba70ac2924c03cb3e Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 02:55:02 2014 + PEP8 add newline after class docstring in EmailServer. --- lib/bridgedb/EmailServer.py |1 + 1 file changed, 1 insertion(+) diff --git

[tor-commits] [bridgedb/develop] Only log incoming emails if SAFELOGGING is disabled.

commit 394161ce5794469602d4c6f3ac194a5646e2e9b8 Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 02:51:44 2014 + Only log incoming emails if SAFELOGGING is disabled. --- lib/bridgedb/EmailServer.py |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git

[tor-commits] [bridgedb/develop] Fix emacs encoding specifier in lib/bridgedb/captcha.py.

commit 9f3d9e31a920518522945f354d2ea78e9726a93e Author: Isis Lovecruft i...@torproject.org Date: Tue Apr 8 12:28:50 2014 + Fix emacs encoding specifier in lib/bridgedb/captcha.py. * FIXES an non-deterministic, intermittent failure in the

[bridgedb/develop] PEP8: use `except … as …` syntax in EmailServer.getMailResponse().

commit 37d144d2c581b43ca73b47fb47cd1b6597a5235c Author: Isis Lovecruft i...@torproject.org Date: Wed Feb 12 15:24:53 2014 + PEP8: use `except … as …` syntax in EmailServer.getMailResponse(). --- lib/bridgedb/EmailServer.py | 18 +- 1 file changed, 9 insertions(+),

[tor-commits] [bridgedb/develop] Use `smtp` rather than `twisted.mail.smtp` in EmailServer.composeMail().

commit a020c975387fc47c1632c80ee19d66222dc2f5b1 Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 02:57:34 2014 + Use `smtp` rather than `twisted.mail.smtp` in EmailServer.composeMail(). --- lib/bridgedb/EmailServer.py |4 ++-- 1 file changed, 2 insertions(+), 2

[tor-commits] [bridgedb/develop] PEP8 reorder import statements in HTTPServer.

commit 24d53464c031b2c70758b1655caf4a305c29dede Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 03:06:30 2014 + PEP8 reorder import statements in HTTPServer. --- lib/bridgedb/HTTPServer.py | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git

[tor-commits] [bridgedb/develop] Catch gimp CAPTCHA challenge decryption ValueErrors.

commit a033b057422772ab01e88e9fae3a04ce554d5e06 Author: Isis Lovecruft i...@torproject.org Date: Tue Apr 8 15:18:35 2014 + Catch gimp CAPTCHA challenge decryption ValueErrors. * ADD unittest will raise a ValueError during decryption with the previous commit's code.

[tor-commits] [bridgedb/develop] Decrease sleep time in server startup unittest.

commit 59c8e1ec08e05d0c3225d58df2804ff838b1509a Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 16:40:02 2014 + Decrease sleep time in server startup unittest. --- lib/bridgedb/test/test_bridgedb.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

[tor-commits] [bridgedb/develop] PEP8 reorder import statements in Main.

commit d04fd55c1bef12fdbb4edef97428d6122cf6b4e2 Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 03:12:34 2014 + PEP8 reorder import statements in Main. --- lib/bridgedb/Main.py |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/bridgedb/Main.py

[tor-commits] [bridgedb/develop] Fix old-style class EmailServer.MailDelivery.

commit 8bc8a8ee81b9a881f1c6d48539f70a4fa51f6f41 Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 02:52:23 2014 + Fix old-style class EmailServer.MailDelivery. --- lib/bridgedb/EmailServer.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [bridgedb/develop] Add BridgeDB logo .png and link to homepage in base.html.

commit 4bc7e9e0bb74580ee82f31884144e06820f2faa4 Author: Isis Lovecruft i...@torproject.org Date: Mon Feb 10 01:52:53 2014 + Add BridgeDB logo .png and link to homepage in base.html. * FIXES #11346 add homepage link to BridgeDB HTTPS distributor. ---

[tor-commits] [bridgedb/develop] Cleanup captcha.html template.

commit 72d5f0c95031756e64c7f5de68967468ffbf747e Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 03:14:40 2014 + Cleanup captcha.html template. * FIX the Type the two words alt text by changing it to Type the word. * CHANGE the I am human button to say

[tor-commits] [bridgedb/develop] Merge branch 'fix/11346-homepage-link' into develop

commit 33499da979404bf7772545974fbdaed32e37ef73 Merge: a033b05 4bc7e9e Author: Isis Lovecruft i...@torproject.org Date: Tue Apr 8 15:33:39 2014 + Merge branch 'fix/11346-homepage-link' into develop lib/bridgedb/templates/assets/bridgedb.png | Bin 0 - 2946 bytes

[tor-commits] [bridgedb/develop] Change gimp CAPTCHA encoding strategy to assume HMAC is 20 bytes.

commit 72c1dcc0fa6cc0a2914e8028193879cc06adb2b0 Author: Isis Lovecruft i...@torproject.org Date: Tue Apr 8 14:16:42 2014 + Change gimp CAPTCHA encoding strategy to assume HMAC is 20 bytes. * CHANGE relevant unittests which looked for the original ';' string delimiter to

[tor-commits] [orbot/master] ensure existing binaries are removed before install

commit b6a9b48e779d687271ef9e43c4a2a059acf79f37 Author: Nathan Freitas nat...@freitas.net Date: Tue Apr 8 11:37:45 2014 -0400 ensure existing binaries are removed before install problems may be caused by soft links or old bins --- .../android/service/TorResourceInstaller.java |

[tor-commits] [orbot/master] updates for icons, backgrounds and improved drawing

commit 3d1f3912eaa1b4602a82ce59b4e95d011adad265 Author: Nathan Freitas nat...@freitas.net Date: Tue Apr 8 10:46:52 2014 -0400 updates for icons, backgrounds and improved drawing code to solve issues related to outofmemory --- res/drawable/ic_launcher.png | Bin

[tor-commits] [orbot/master] updated to dark icon

commit 9d1311c3427387945b38189a4851c3c82f378e7d Author: Nathan Freitas nat...@freitas.net Date: Tue Apr 8 10:46:11 2014 -0400 updated to dark icon --- web_hi_res_512_dark.png | Bin 0 - 187867 bytes web_hi_res_512_dark.xcf | Bin 0 - 671813 bytes 2 files changed, 0 insertions(+), 0

[tor-commits] [orbot/master] small fixes for the wizard with new UI

commit bab67b7c131915273df1987b237407a2bec2b05d Author: Nathan Freitas nat...@freitas.net Date: Tue Apr 8 11:36:59 2014 -0400 small fixes for the wizard with new UI --- res/layout/layout_wizard_locale.xml|2 +- res/layout/layout_wizard_root.xml | 20

[tor-commits] [orbot/master] update to 13.0.6-BETA-5

commit 981123f5fe44b378e9d475dc81ba52b5d74bf133 Author: Nathan Freitas nat...@freitas.net Date: Tue Apr 8 11:38:24 2014 -0400 update to 13.0.6-BETA-5 --- AndroidManifest.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml

[tor-commits] [bridgedb/develop] PEP8 whitespace fixes for EmailServer.

commit 6d3686f31dbe94a7d5de19b2f81b9bd8c0f49b79 Author: Isis Lovecruft i...@torproject.org Date: Sun Apr 6 22:40:24 2014 + PEP8 whitespace fixes for EmailServer. --- lib/bridgedb/EmailServer.py | 80 --- 1 file changed, 44 insertions(+), 36

[tor-commits] [tor/master] Fix to 9841 fix: setting a token to NULL should clear it

commit 09dbcf3b82c6db76024a5345b98f34028b40c30c Author: Nick Mathewson ni...@torproject.org Date: Fri Apr 4 12:01:49 2014 -0400 Fix to 9841 fix: setting a token to NULL should clear it Found by testing with chutney. The old behavior was fail an assertion, which obviously isn't

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug9841_024_v2' into bug9841_025

commit ecf61e924d5807420aaeee8620dc83f3b952d77f Merge: 745434d 8b9a2cb Author: Nick Mathewson ni...@torproject.org Date: Thu Feb 13 14:49:15 2014 -0500 Merge remote-tracking branch 'public/bug9841_024_v2' into bug9841_025 Conflicts: src/or/circuitlist.c changes/bug9841

[tor-commits] [tor/master] Tests for rend_token maps

commit fb595922b12c9ab89f51527def68e9b71386caf7 Author: Nick Mathewson ni...@torproject.org Date: Thu Feb 13 15:24:15 2014 -0500 Tests for rend_token maps This gets coverage of everything except for the cases which should be impossible. --- src/test/test_circuitlist.c | 85

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug9841_024_v2' into bug9841_025

commit 1bb6e3b503bfe4f7f5a8ee707433b6f9973e4dea Merge: fb59592 09dbcf3 Author: Nick Mathewson ni...@torproject.org Date: Fri Apr 4 12:05:51 2014 -0400 Merge remote-tracking branch 'public/bug9841_024_v2' into bug9841_025 src/or/circuitlist.c |5 + 1 file changed, 5 insertions(+)

[tor-commits] [tor/master] Protocol_Warn when a rendezvous cookie is used twice.

commit 8f16a77d6ae6bfc8f7983decf8269ae70ca1cc5e Author: Nick Mathewson ni...@torproject.org Date: Fri Apr 4 12:17:16 2014 -0400 Protocol_Warn when a rendezvous cookie is used twice. --- src/or/circuitlist.c |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git

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

commit fffc59b0e941f12e1588e0604c8295ecc0679150 Merge: f0bce2d 8f16a77 Author: Nick Mathewson ni...@torproject.org Date: Tue Apr 8 12:06:03 2014 -0400 Merge remote-tracking branch 'public/bug9841_025' changes/bug9841 |7 ++ src/or/circuitlist.c| 164

[tor-commits] [tor/master] Test for circuit_set_rend_token(., ., NULL)

commit d22ce149c82c257398555d35cf76cab4973a8cf9 Author: Nick Mathewson ni...@torproject.org Date: Fri Apr 4 12:06:54 2014 -0400 Test for circuit_set_rend_token(.,.,NULL) --- src/test/test_circuitlist.c |5 + 1 file changed, 5 insertions(+) diff --git a/src/test/test_circuitlist.c

[tor-commits] [bridgedb/develop] Add config options for safelogging and logging threads.

commit 292ac8e0b1baa5fde56ef7f9869dd19eae29599d Author: Isis Lovecruft i...@torproject.org Date: Tue Feb 11 13:54:53 2014 + Add config options for safelogging and logging threads. * ADD several new config options: - LOG_THREADS: adds the thread name and id,

[tor-commits] [bridgedb/develop] Move log configuration functions to bridgedb.util module.

commit cc83936455cbe4e39016b3aef9d345652a82130d Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 12:17:49 2014 + Move log configuration functions to bridgedb.util module. * MOVE `Main.configureLogging()` → `util.configureLogging()`. * CHANGE

[tor-commits] [bridgedb/develop] Add bridgedb.safelog sources to Sphinx build configs.

commit 6a0ed07abf32366642badd9c32c0b0a55fd37688 Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 12:16:21 2014 + Add bridgedb.safelog sources to Sphinx build configs. --- doc/sphinx/source/bridgedb.rst |1 + doc/sphinx/source/bridgedb.safelog.rst |9 +

[tor-commits] [bridgedb/develop] Add unittests for bridgedb.safelog module.

commit 0dc4e5b040e7dbe9714ea5b563caa32182a07cc7 Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 12:28:07 2014 + Add unittests for bridgedb.safelog module. * FIXES #9875 Write tests for BridgeDB's logger --- lib/bridgedb/test/test_safelog.py | 336

[tor-commits] [bridgedb/develop] Add module bridgedb.safelog with automatic log filters.

commit 1206c811f73451d9e2a0e4c186ebcfe6a62ecaa3 Author: Isis Lovecruft i...@torproject.org Date: Wed Feb 12 15:24:53 2014 + Add module bridgedb.safelog with automatic log filters. Include automatic filters for email addresses and IPv4/6 addresses. Things such as bridge

[tor-commits] [bridgedb/develop] Move manual safelog setting and functions to bridgedb.safelog module.

commit b5734531a5d1e8789638a7c1d8cb45e8650fd3af Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 11:23:47 2014 + Move manual safelog setting and functions to bridgedb.safelog module. * MOVE util.safe_logging → safelog.safe_logging. * MOVE util.set_safe_logging

[tor-commits] [bridgedb/develop] Merge branch 'fix/9199-safelogging' into develop

commit 0275fa56cbd39c6f452cc973ac34d955f0ec6603 Merge: 33499da d68f8e2 Author: Isis Lovecruft i...@torproject.org Date: Tue Apr 8 16:08:19 2014 + Merge branch 'fix/9199-safelogging' into develop bridgedb.conf | 18 +- doc/sphinx/source/bridgedb.rst |

[tor-commits] [bridgedb/develop] Fix recursion in filtered log call in validation used by log filter.

commit d68f8e2427a5b9623a7d4907c177bf2cc46da9b2 Author: Isis Lovecruft i...@torproject.org Date: Mon Apr 7 12:32:47 2014 + Fix recursion in filtered log call in validation used by log filter. We can't log an IP address in a IP validation function which is used by a log

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

commit 3ac426afe8f169cb2c16de9d37b8630b7c3216f5 Merge: fffc59b 2f59d6e Author: Nick Mathewson ni...@torproject.org Date: Tue Apr 8 12:41:03 2014 -0400 Merge remote-tracking branch 'public/bug4241' changes/bug4241 |3 +++ src/or/rendservice.c |2 +- 2 files changed, 4

[tor-commits] [tor/master] Drop MAX_REND_FAILURES to 8

commit 2f59d6e2d81cea3005e488e31f824ff1b9b303c4 Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 2 15:36:13 2014 -0400 Drop MAX_REND_FAILURES to 8 --- changes/bug4241 |3 +++ src/or/rendservice.c |2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git

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

commit 686d83655351b03a3228f6c7eaa9468c2e01045a Author: Translation commit bot translat...@torproject.org Date: Tue Apr 8 17:45:33 2014 + Update translations for tor-launcher-properties_completed --- uk/torlauncher.properties |1 + 1 file changed, 1 insertion(+) diff --git

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

commit 9652c9ed25f6b8e965251ccd5e2f2cbcbde8764f Author: Translation commit bot translat...@torproject.org Date: Tue Apr 8 17:45:30 2014 + Update translations for tor-launcher-properties --- uk/torlauncher.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/master] Merge branch 'bug7952_final'

commit 245f273aaf6a6189a57d837d5fd76b76cc9b6f8e Merge: 3ac426a 51e13cd Author: Nick Mathewson ni...@torproject.org Date: Tue Apr 8 13:55:02 2014 -0400 Merge branch 'bug7952_final' Conflicts: src/test/include.am src/test/test.c changes/ticket7952 |4 +++

[tor-commits] [tor/master] Making entire exit policy available to Tor controller.

commit 51e13cd1ad5f7c130521e2a964ea462f35d1880e Author: rl1987 nob...@nowhere.int Date: Fri Aug 23 21:06:42 2013 +0300 Making entire exit policy available to Tor controller. --- changes/ticket7952 |4 +++ src/or/control.c |3 ++ src/or/policies.c | 23

[tor-commits] [torspec/master] document new exit-policy/* GETINFOs

commit 42b373af2ed3fb006c01ab584d36e89228588b28 Author: Nick Mathewson ni...@torproject.org Date: Tue Apr 8 13:57:29 2014 -0400 document new exit-policy/* GETINFOs --- control-spec.txt |9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/control-spec.txt

[tor-commits] [tor/master] Remove unused extern decl for a nonexistent test suite

commit d0af6657581df662e51037dd510c2295492740d1 Author: Nick Mathewson ni...@torproject.org Date: Tue Apr 8 14:10:59 2014 -0400 Remove unused extern decl for a nonexistent test suite --- src/test/test.c |1 - 1 file changed, 1 deletion(-) diff --git a/src/test/test.c b/src/test/test.c

[tor-commits] [tor/master] Move existing policy tests from test.c to new test_policy.c

commit b933fdcc11dd12969acf06d688ebf4730147133e Author: Nick Mathewson ni...@torproject.org Date: Tue Apr 8 14:14:12 2014 -0400 Move existing policy tests from test.c to new test_policy.c --- src/test/test.c| 342 +---

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

commit ae05c1e6f7eb71181ca7fbb126b1b6b973f06296 Author: Translation commit bot translat...@torproject.org Date: Tue Apr 8 18:15:37 2014 + Update translations for tails-misc --- da.po |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/da.po b/da.po index

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

commit 638626ae70c26516d3c0daf99cbf90bcf7cc4c9f Author: Translation commit bot translat...@torproject.org Date: Tue Apr 8 18:15:40 2014 + Update translations for tails-misc_completed --- da.po | 50 +++--- 1 file changed, 31 insertions(+),

[tor-commits] [bridgedb/develop] Remove commented version string generation code from __init__.py.

commit 2f8dee1bb22d3802fcf62cba84cecf47b3c15a1a Author: Isis Lovecruft i...@torproject.org Date: Tue Apr 8 16:10:43 2014 + Remove commented version string generation code from __init__.py. --- lib/bridgedb/__init__.py |2 -- 1 file changed, 2 deletions(-) diff --git

[tor-commits] [bridgedb/develop] Rewrite docstring for HTTPServer.WebResourceBridges class.

commit efd3617ac1996dec57077b3fecab2b4acfc6 Author: Isis Lovecruft i...@torproject.org Date: Tue Apr 8 16:15:23 2014 + Rewrite docstring for HTTPServer.WebResourceBridges class. --- lib/bridgedb/HTTPServer.py |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git

[tor-commits] [bridgedb/develop] Rewrite docstring for HTTPServer.WebResourceOptions class.

commit b9684c4d7ff8fbdd9b600ef3af11ab3356df007c Author: Isis Lovecruft i...@torproject.org Date: Tue Apr 8 16:17:44 2014 + Rewrite docstring for HTTPServer.WebResourceOptions class. --- lib/bridgedb/HTTPServer.py |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff

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

commit 630edde1aced8075e0b0647e509761316b6505e5 Author: Translation commit bot translat...@torproject.org Date: Tue Apr 8 18:45:34 2014 + Update translations for tor-launcher-properties --- da/torlauncher.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [torspec/master] Draft proposal for how to migrate a bunch of router identity keys

commit ea5677f354a55d4a4b389b65045c60531cbcbab3 Author: Nick Mathewson ni...@torproject.org Date: Mon Apr 7 19:02:53 2014 -0400 Draft proposal for how to migrate a bunch of router identity keys We might decide to do this as part of a CVE-2014-0160 response. ---

[tor-commits] [torspec/master] fix typo and reindex

commit ce5420d0afe0062a0cd561069b0d0e324b6ca9e1 Author: Nick Mathewson ni...@torproject.org Date: Tue Apr 8 14:47:37 2014 -0400 fix typo and reindex --- proposals/000-index.txt |2 ++ proposals/230-rsa1024-relay-id-migration.txt |2 +- 2 files changed, 3

[tor-commits] [torspec/master] Give the rsa1024-relay-id-migration.txt proposal a number

commit 8bc6db6a9f8ac4eb3d85cfe574653b1ef8f255d3 Author: Nick Mathewson ni...@torproject.org Date: Tue Apr 8 14:44:33 2014 -0400 Give the rsa1024-relay-id-migration.txt proposal a number --- proposals/230-rsa1024-relay-id-migration.txt | 83 ++

[tor-commits] [torspec/master] Merge branch 'rsa1024_migrate'

commit 42b4c0d96098167924dcf4694fcbdb68cd24e5dd Merge: 42b373a 8bc6db6 Author: Nick Mathewson ni...@torproject.org Date: Tue Apr 8 14:45:06 2014 -0400 Merge branch 'rsa1024_migrate' proposals/230-rsa1024-relay-id-migration.txt | 83 ++ 1 file changed, 83

[tor-commits] [torspec/master] spelling

commit 663401c9bc6e2ff7d1d55dead60bb3714a5476aa Author: Nick Mathewson ni...@torproject.org Date: Mon Apr 7 22:22:19 2014 -0400 spelling --- proposals/xxx-rsa1024-relay-id-migration.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

commit 4077d2b18bca51c2f6035f8a6af173a23866af55 Author: Translation commit bot translat...@torproject.org Date: Tue Apr 8 18:45:36 2014 + Update translations for tor-launcher-properties_completed --- da/torlauncher.properties |1 + 1 file changed, 1 insertion(+) diff --git

[tor-commits] [torspec/master] Proposal 231: Migrating authority RSA1024 identity keys

commit df51057a3f437ca69df026c0da66a3e280bb44e8 Author: Nick Mathewson ni...@torproject.org Date: Tue Apr 8 15:20:27 2014 -0400 Proposal 231: Migrating authority RSA1024 identity keys --- proposals/000-index.txt |2 +

[tor-commits] [tor/master] Merge branch 'bug2454_025_squashed'

commit 689863d0a9432250f2c9a67e3e7ba2c4e5dae4c6 Merge: b933fdc 2d5a7b1 Author: Nick Mathewson ni...@torproject.org Date: Tue Apr 8 15:37:15 2014 -0400 Merge branch 'bug2454_025_squashed' changes/bug2454 |6 ++ src/or/circuitstats.c | 12 +++- src/or/main.c

[tor-commits] [tor/master] Check for new IP addr after circuit liveliness returns

commit 2d5a7b1842b3dad522166659ff3a88e418f36d13 Author: Matthew Finkel matthew.fin...@gmail.com Date: Tue Apr 1 17:30:20 2014 -0400 Check for new IP addr after circuit liveliness returns When we successfully create a usable circuit after it previously timed out for a certain

[tor-commits] [orbot/master] adding new small icon

commit 25f4ac8617dd13a56c650d7404e7002fa68c4f02 Author: Nathan Freitas nat...@freitas.net Date: Tue Apr 8 12:19:44 2014 -0400 adding new small icon --- res/drawable/onion32.png | Bin 0 - 1599 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/res/drawable/onion32.png

[tor-commits] [orbot/master] ensure existing files are deleted before upgrade

commit e8116f45422d44ebdf7a9b5133d3c506167d74ad Author: Nathan Freitas nat...@freitas.net Date: Tue Apr 8 15:31:02 2014 -0400 ensure existing files are deleted before upgrade --- .../android/service/TorResourceInstaller.java | 26 +++- 1 file changed, 9

[tor-commits] [orbot/master] use AbsolutePath instead of Canonical; fix kill code

commit bf8a92cb7a1ea59a21e81e41f88cf6c847e2a883 Author: Nathan Freitas nat...@freitas.net Date: Tue Apr 8 15:33:05 2014 -0400 use AbsolutePath instead of Canonical; fix kill code --- src/org/torproject/android/service/TorService.java | 119 +--- 1 file changed, 55

[tor-commits] [orbot/master] fix problem with UI rotation and screen update

commit f885059b94473af089f2fdd99e79c6aa0f62bd07 Author: Nathan Freitas nat...@freitas.net Date: Tue Apr 8 15:46:10 2014 -0400 fix problem with UI rotation and screen update --- src/org/torproject/android/Orbot.java |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

  1   2   >