[bridgedb/develop] Move email address parsers from bridgedb.Dist → bridgedb.parse.addr.

2014-04-16 Thread isis
commit dfe81deffb272e4585af141ad58ece7d68e352f8 Author: Isis Lovecruft Date: Tue Apr 8 21:37:11 2014 + Move email address parsers from bridgedb.Dist → bridgedb.parse.addr. --- lib/bridgedb/Dist.py | 117 +++--- lib/bridgedb/EmailServer.py |

[tor-commits] [bridgedb/develop] Add unittest for EmailServer.replyToMail().

2014-04-16 Thread isis
commit f9e2175750b998366492fbb197594b8eb226fbaa Author: Isis Lovecruft Date: Tue Apr 8 21:28:34 2014 + Add unittest for EmailServer.replyToMail(). --- lib/bridgedb/test/test_EmailServer.py | 42 - 1 file changed, 41 insertions(+), 1 deletion(-) diff -

[tor-commits] [bridgedb/develop] Add doctrings to test_EmailServer.EmailResponseTests.

2014-04-16 Thread isis
commit 3e25fdbbaee346c61ab9f1c664d32597033142fd Author: Isis Lovecruft Date: Thu Apr 17 02:50:32 2014 + Add doctrings to test_EmailServer.EmailResponseTests. --- lib/bridgedb/test/test_EmailServer.py | 17 +++-- 1 file changed, 11 insertions(+), 6 deletions(-) diff --git

[tor-commits] [bridgedb/develop] Fix unicode encoding errors in outgoing SMTP transport.

2014-04-16 Thread isis
commit fcaf0a5a4401d9f85bd16b550edfefaa2ef50559 Author: Isis Lovecruft Date: Tue Apr 8 23:30:27 2014 + Fix unicode encoding errors in outgoing SMTP transport. * REFACTOR bridgedb.EmailServer.composeEmail() to use io.BytesIO. --- lib/bridgedb/EmailServer.py | 83 +++

[tor-commits] [bridgedb/develop] Split unittests for EmailServer.getMailResponse() into smaller tests.

2014-04-16 Thread isis
commit 8274af32008893b461f81e96c2a037fe5a96b996 Author: Isis Lovecruft Date: Tue Apr 8 18:34:12 2014 + Split unittests for EmailServer.getMailResponse() into smaller tests. --- lib/bridgedb/test/test_EmailServer.py | 58 + 1 file changed, 44 insertions

[bridgedb/develop] Move EmailServer.getGPGContext() → crypto.getGPGContext().

2014-04-16 Thread isis
commit 7b75cff76edac559e6dbf6f24584e86f948aa597 Author: Isis Lovecruft Date: Wed Apr 16 22:33:33 2014 + Move EmailServer.getGPGContext() → crypto.getGPGContext(). * ADD new class, `bridgedb.crypto.LessCrypticGpgmeError` for parsing GPGME errors. Usually, t

[tor-commits] [bridgedb/develop] Add missing newline separator in the "no bridges" email response.

2014-04-16 Thread isis
commit f6f1bd8542b2942f25543604ac06901ae5ef469e Author: Isis Lovecruft Date: Thu Apr 17 03:34:52 2014 + Add missing newline separator in the "no bridges" email response. --- lib/bridgedb/EmailServer.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/

[bridgedb/develop] Rewrite test_EmailServer.FakeDistributor → test_EmailServer.DummyEmailDistibutor.

2014-04-16 Thread isis
commit 208b2d3bb116190801c469aea3af420ddcdf7396 Author: Isis Lovecruft Date: Thu Apr 17 02:43:29 2014 + Rewrite test_EmailServer.FakeDistributor → test_EmailServer.DummyEmailDistibutor. --- lib/bridgedb/test/test_EmailServer.py | 61 ++--- 1 file change

[tor-commits] [bridgedb/develop] Fix broken test_EmailServer unittests due to extra newline.

2014-04-16 Thread isis
commit 84c58ed6cc0b5ae4f50ed5f5e5623304c37f2526 Author: Isis Lovecruft Date: Thu Apr 17 02:44:57 2014 + Fix broken test_EmailServer unittests due to extra newline. --- lib/bridgedb/test/test_EmailServer.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridg

[tor-commits] [bridgedb/develop] Merge branch 'fix/7550-9678-interactive-translations' into develop

2014-04-16 Thread isis
commit 63c32b501738e420e05a7617e1bb08bff489af37 Merge: 09a49cd a6edfae Author: Isis Lovecruft Date: Thu Apr 17 04:10:02 2014 + Merge branch 'fix/7550-9678-interactive-translations' into develop lib/bridgedb/EmailServer.py| 29 +--- lib/bridgedb/HTTPServer.py

[tor-commits] [bridgedb/develop] Update CHANGELOG with entries for 0.1.7.

2014-04-16 Thread isis
commit 45d6effabd43fbd0f99dd747ce768441ea2c3d70 Author: Isis Lovecruft Date: Thu Apr 17 05:04:14 2014 + Update CHANGELOG with entries for 0.1.7. --- CHANGELOG | 62 + 1 file changed, 50 insertions(+), 12 deletions(-) diff -

[tor-commits] [bridgedb/develop] Skip several email unittests, manual test results seem fine.

2014-04-16 Thread isis
commit c2feac1e043753ef11b39f02fcda287a54f045c0 Author: Isis Lovecruft Date: Thu Apr 17 03:32:52 2014 + Skip several email unittests, manual test results seem fine. --- lib/bridgedb/test/test_EmailServer.py | 17 + 1 file changed, 17 insertions(+) diff --git a/lib/br

[bridgedb/develop] PEP8; change template_root → TEMPLATE_DIR.

2014-04-16 Thread isis
commit 4a9eb669830ae8a3d12335227cce7c34b5002193 Author: Isis Lovecruft Date: Wed Apr 16 19:38:44 2014 + PEP8; change template_root → TEMPLATE_DIR. --- lib/bridgedb/HTTPServer.py | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/bridgedb/HTTPServer

[tor-commits] [bridgedb/develop] Reorder transport requests in unittests.

2014-04-16 Thread isis
commit 82547638ea0f6dbe0839cb1e2743c7eac2499795 Author: Isis Lovecruft Date: Thu Apr 17 03:30:50 2014 + Reorder transport requests in unittests. BridgeDB only pays attention to the last transport request it received in an email. --- lib/bridgedb/test/test_EmailServer.py |

[tor-commits] [bridgedb/develop] Simplify test_EmailServer.EmailResponseTests assertion checks.

2014-04-16 Thread isis
commit 1e9c46fc4b238085141fb50e98183aa64e90db26 Author: Isis Lovecruft Date: Thu Apr 17 02:48:46 2014 + Simplify test_EmailServer.EmailResponseTests assertion checks. --- lib/bridgedb/test/test_EmailServer.py | 64 + 1 file changed, 24 insertions(+), 4

[tor-commits] [bridgedb/develop] Add crypto.gpgSignMessage() utility function.

2014-04-16 Thread isis
commit b2c7a2a20ca07dec8dd7c9a812f8173127c45b3a Author: Isis Lovecruft Date: Wed Apr 16 22:41:48 2014 + Add crypto.gpgSignMessage() utility function. --- lib/bridgedb/EmailServer.py |1 + lib/bridgedb/crypto.py | 26 ++ 2 files changed, 27 insertions(

[tor-commits] [bridgedb/develop] Merge branch 'fix/11522-exc-in-email-dist' into develop

2014-04-16 Thread isis
commit 39e3cf66a2324e262ae1fc617f4f2d0e79c0bf49 Merge: 63c32b5 f6f1bd8 Author: Isis Lovecruft Date: Thu Apr 17 04:21:05 2014 + Merge branch 'fix/11522-exc-in-email-dist' into develop Conflicts: lib/bridgedb/EmailServer.py lib/bridgedb/Dist.py | 117 +

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

2014-04-16 Thread isis
commit 7cd85e71440a432a0a9963904f535944c57ebde0 Author: Isis Lovecruft Date: Thu Apr 17 03:34:11 2014 + PEP8 whitespace fixes in EmailServer. --- lib/bridgedb/EmailServer.py |5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bri

[tor-commits] [bridgedb/develop] Always return a Deferred from EmailServer.composeMail().

2014-04-16 Thread isis
commit 71127f9d2e41bec4462f979ed4d2e42d6a0be2c8 Author: Isis Lovecruft Date: Wed Apr 16 22:24:15 2014 + Always return a Deferred from EmailServer.composeMail(). --- lib/bridgedb/EmailServer.py | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/bri

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

2014-04-16 Thread isis
commit a6edfaeb6fc8036c60d9c20bf871795cba198337 Author: Isis Lovecruft Date: Wed Apr 16 19:19:49 2014 + Add unittests for new bridgedb.translations module. --- lib/bridgedb/test/test_translations.py | 78 1 file changed, 78 insertions(+) diff --git a

[tor-commits] [bridgedb/develop] Rewrite EmailServer.getMailResponse() to handle unicode.

2014-04-16 Thread isis
commit 26198f5f513a77364965b29a19a9fe4bf58a015b Author: Isis Lovecruft Date: Wed Apr 16 22:18:29 2014 + Rewrite EmailServer.getMailResponse() to handle unicode. * FIXES #11522 * REMOVES EmailServer.MailFile class. * CHANGES EmailServer to use twisted.mail.smtp.rfc822

[tor-commits] [bridgedb/develop] Fix test_EmailServer unittests which expected StringIO.

2014-04-16 Thread isis
commit 711043a94221061754600addf0cd9707b3628590 Author: Isis Lovecruft Date: Wed Apr 16 20:23:27 2014 + Fix test_EmailServer unittests which expected StringIO. --- lib/bridgedb/test/test_EmailServer.py | 44 ++--- 1 file changed, 24 insertions(+), 20 delet

[tor-commits] [bridgedb/develop] Move locate determination and translation code into separate module.

2014-04-16 Thread isis
commit ed438d0c2b00f02c29b60e561d37f241f6a6a4b8 Author: Isis Lovecruft Date: Wed Apr 16 16:22:40 2014 + Move locate determination and translation code into separate module. * ADD new bridgedb.translations module with the following methods: - getFirstSupportedLang()

[tor-commits] [bridgedb/develop] Implement correct EmailServer.MailDelivery.receivedHeader() parsing.

2014-04-16 Thread isis
commit 714c16a8f0875c23af1cb044cc46a76e5356ac6e Author: Isis Lovecruft Date: Wed Apr 16 22:29:23 2014 + Implement correct EmailServer.MailDelivery.receivedHeader() parsing. --- lib/bridgedb/EmailServer.py | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff

[tor-commits] [bridgedb/develop] Update docstring for I18n._().

2014-04-16 Thread isis
commit 09a49cd22939986a4b038c7e48f75c7a44853312 Author: Isis Lovecruft Date: Wed Apr 16 19:44:47 2014 + Update docstring for I18n._(). --- lib/bridgedb/I18n.py |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/I18n.py b/lib/bridgedb/I18n.py index

[tor-commits] [bridgedb/develop] Fix issue with transport URL params in HTTPServer unittests.

2014-04-16 Thread isis
commit 5e37dc53df4704c9b4ab0f3943159a5198f0c515 Author: Isis Lovecruft Date: Wed Apr 16 19:26:19 2014 + Fix issue with transport URL params in HTTPServer unittests. Also fixes several PEP8 whitespace issues in test_HTTPServer.py. --- lib/bridgedb/test/test_HTTPServer.py | 83

[bridgedb/develop] PEP8; change geoipdb → GEOIP_DBFILE.

2014-04-16 Thread isis
commit 1115b5ab2b41780761c9f4fa52bb0dbefd41db45 Author: Isis Lovecruft Date: Wed Apr 16 19:40:47 2014 + PEP8; change geoipdb → GEOIP_DBFILE. --- lib/bridgedb/HTTPServer.py | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/li

[tor-commits] [tor/master] Fix uninitialized-ram free in unit tests

2014-04-16 Thread nickm
commit 0175fcaf7c6284f8961e112fab80beb4257f0faf Author: Nick Mathewson Date: Thu Apr 17 01:03:10 2014 -0400 Fix uninitialized-ram free in unit tests Fix on fb595922; bug not in any released Tor. Found with --enable-expensive-hardening. --- src/test/test_circuitlist.c | 12 ++

[tor-commits] [tor/master] Merge more changes files (verbatim) into the changelog

2014-04-16 Thread nickm
commit ab83a27450fc3afb57874ca202dcee570607a1ff Author: Nick Mathewson Date: Thu Apr 17 00:13:11 2014 -0400 Merge more changes files (verbatim) into the changelog --- ChangeLog | 87 ++- changes/10267_tproxy|4 -- chan

[tor-commits] [tor/master] Log the name of the failing syscall on failure

2014-04-16 Thread nickm
commit f41491816ca1ac8dc39c4da0f6b9fe1065c5228a Author: Nick Mathewson Date: Wed Apr 16 22:22:47 2014 -0400 Log the name of the failing syscall on failure --- src/common/gen_linux_syscalls.pl | 37 ++ src/common/include.am|1 + src/common/linux_syscalls.inc| 1153

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

2014-04-16 Thread nickm
commit 4367cbd71b7a7b53e191b54a67ee6cbc00651024 Merge: 250b84b 506c890 Author: Nick Mathewson Date: Wed Apr 16 23:45:55 2014 -0400 Merge remote-tracking branch 'public/sandbox_fixes_rebased_2' changes/sandbox_fixes_11351 | 13 + configure.ac |1 + src/common

[tor-commits] [tor/master] Fix some initial sandbox issues.

2014-04-16 Thread nickm
commit ae9d6d73f50f6205f0651a627d3bf7b0d99273f1 Author: Nick Mathewson Date: Fri Mar 28 01:52:08 2014 -0400 Fix some initial sandbox issues. Allow files that weren't in the list; Allow the _sysctl syscall; allow accept4 with CLOEXEC and NONBLOCK. --- src/common/sandbox.c |

[tor-commits] [tor/master] Don't allow change to ConnLimit while sandbox is active

2014-04-16 Thread nickm
commit 619497076585c54dc80656cdd4e6181f1109ff53 Author: Nick Mathewson Date: Wed Apr 16 16:05:10 2014 -0400 Don't allow change to ConnLimit while sandbox is active --- src/common/sandbox.c | 11 +++ src/common/sandbox.h |3 +++ src/or/config.c | 18 --

[tor-commits] [tor/master] Get Libevent's PRNG functioning under the linux sandbox

2014-04-16 Thread nickm
commit e6785ee16dce675aa770616bcdbd128d5dfb1132 Author: Nick Mathewson Date: Wed Apr 16 14:54:39 2014 -0400 Get Libevent's PRNG functioning under the linux sandbox Libevent uses an arc4random implementation (I know, I know) to generate DNS transaction IDs and capitalization. B

[tor-commits] [tor/master] Only intern one copy of each magic string for the sandbox

2014-04-16 Thread nickm
commit 3802e32c7d94c599546069d8246636b0d3a4ad10 Author: Nick Mathewson Date: Fri Mar 28 02:10:19 2014 -0400 Only intern one copy of each magic string for the sandbox If we intern two copies of a string, later calls to sandbox_intern_string will give the wrong one sometimes. ---

[tor-commits] [tor/master] Use SCMP_CMP_MASKED_EQ to allow flags, not force them

2014-04-16 Thread nickm
commit 69eb2788302aa96e7d37597c407e8f7da4e8a96f Author: Nick Mathewson Date: Wed Apr 16 15:17:23 2014 -0400 Use SCMP_CMP_MASKED_EQ to allow flags, not force them Older versions of Libevent are happy to open SOCK_DGRAM sockets non-cloexec and non-nonblocking, and then set those

[tor-commits] [tor/master] Allow reloading torrc and writing to router-stability

2014-04-16 Thread nickm
commit 18f7f49a8c08a38c15de4b8e6413ed2ae0968639 Author: Nick Mathewson Date: Wed Apr 16 15:54:45 2014 -0400 Allow reloading torrc and writing to router-stability --- src/or/main.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index cdbb2db.

[tor-commits] [tor/master] Introduce arg-counting macros to wrap seccomp_rule_add()

2014-04-16 Thread nickm
commit 8dc6755f6d65d7ff847bd5e8cf681e6de7fabbc5 Author: Nick Mathewson Date: Wed Apr 16 12:59:33 2014 -0400 Introduce arg-counting macros to wrap seccomp_rule_add() The compiler doesn't warn about this code: rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), 1,

[tor-commits] [tor/master] add a changes file for the sandbox fixes series

2014-04-16 Thread nickm
commit 506c8904402907f84f8c5ddcd6ecf15bb66d4030 Author: Nick Mathewson Date: Wed Apr 16 22:45:27 2014 -0400 add a changes file for the sandbox fixes series --- changes/sandbox_fixes_11351 | 13 + 1 file changed, 13 insertions(+) diff --git a/changes/sandbox_fixes_11351 b/cha

[tor-commits] [tor/master] Make sure everything using an interned string is preceded by a log

2014-04-16 Thread nickm
commit 156eefca454e10440d1070f7500e1708589fc64b Author: Nick Mathewson Date: Wed Apr 16 13:17:09 2014 -0400 Make sure everything using an interned string is preceded by a log (It's nice to know what we were about to rename before we died from renaming it.) --- src/common/compa

[tor-commits] [tor/master] Drop 'fr' parameter from sandbox code.

2014-04-16 Thread nickm
commit 71eaebd971f4d42b26fb6b85780163bbc0111aae Author: Nick Mathewson Date: Fri Apr 11 03:04:16 2014 -0400 Drop 'fr' parameter from sandbox code. Appearently, the majority of the filenames we pass to sandbox_cfg_allow() functions are "freeable right after". So, consider _a

[tor-commits] [tor/master] Don't reload logs or rewrite pidfile while sandbox is active

2014-04-16 Thread nickm
commit c80a6bd9d5cc341f822255050a24760d11cbd94a Author: Nick Mathewson Date: Wed Apr 16 16:26:20 2014 -0400 Don't reload logs or rewrite pidfile while sandbox is active --- src/or/config.c | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/or/config.c

[tor-commits] [tor/master] Have sandbox string protection include multi-valued parmeters.

2014-04-16 Thread nickm
commit 5aaac938a94fc0b5d7dc63cac92e78d3125f08c8 Author: Nick Mathewson Date: Wed Apr 16 12:45:34 2014 -0400 Have sandbox string protection include multi-valued parmeters. --- src/common/sandbox.c | 103 +++--- 1 file changed, 64 insertions(+), 3

[tor-commits] [tor/master] Add a couple of missing renames so the server sandbox works again

2014-04-16 Thread nickm
commit ce776cf2700e5bb484630bc287b31204162adfac Author: Nick Mathewson Date: Wed Apr 16 15:15:31 2014 -0400 Add a couple of missing renames so the server sandbox works again --- src/or/main.c |7 +++ 1 file changed, 7 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index

[tor-commits] [tor/master] Block certain option transitions while sandbox enabled

2014-04-16 Thread nickm
commit 2ae47d3c3ad7121b3ebfa8aa47cd67336218163e Author: Nick Mathewson Date: Wed Apr 16 21:57:45 2014 -0400 Block certain option transitions while sandbox enabled --- src/or/config.c | 32 1 file changed, 32 insertions(+) diff --git a/src/or/config.c b/s

[tor-commits] [tor/master] Clean up sandbox structures a bit

2014-04-16 Thread nickm
commit f268101a612bd637e270914365271d08fc5813db Author: Nick Mathewson Date: Wed Apr 16 12:24:08 2014 -0400 Clean up sandbox structures a bit Drop pindex,pindex2 as unused. Admit a type to avoid using a void* --- src/common/sandbox.c | 42 ---

[tor-commits] [tor/master] Add missing rename function for non-linux platforms

2014-04-16 Thread nickm
commit 6807b76a5e004a2d6c9f46f8b4dec0c90007996c Author: Nick Mathewson Date: Fri Apr 11 03:06:05 2014 -0400 Add missing rename function for non-linux platforms --- src/common/sandbox.c |7 +++ 1 file changed, 7 insertions(+) diff --git a/src/common/sandbox.c b/src/common/sandbox.c

[tor-commits] [tor/master] Remove nonsensical exec permission from sandbox code.

2014-04-16 Thread nickm
commit e051e192a8b199c20ece2a4205c9642a4a0cee22 Author: Nick Mathewson Date: Fri Apr 11 02:40:15 2014 -0400 Remove nonsensical exec permission from sandbox code. --- src/or/main.c |2 -- 1 file changed, 2 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 3c248bb..e6c1636 1

[tor-commits] [tor/master] Fix sandbox protection for rename

2014-04-16 Thread nickm
commit 12028c29e6ee8d0d9c02b32f1a52a35138e148e3 Author: Nick Mathewson Date: Wed Apr 16 12:50:24 2014 -0400 Fix sandbox protection for rename (We were only checking the first parameter of each rename call.) --- src/common/sandbox.c | 16 ++-- 1 file changed, 2 insert

[tor-commits] [tor/master] Sandbox: permit O_NONBLOCK and O_NOCTTY for files we refuse

2014-04-16 Thread nickm
commit f70cf9982ae3b0e57ca62612988478906707567f Author: Nick Mathewson Date: Wed Apr 16 21:50:49 2014 -0400 Sandbox: permit O_NONBLOCK and O_NOCTTY for files we refuse OpenSSL needs this, or RAND_poll() will kill the process. Also, refuse with EACCESS, not errno==-1 (!). -

[tor-commits] [tor/master] Add 'rename' to the sandboxed syscalls

2014-04-16 Thread nickm
commit cbfb8e703ed9c7e31848ebf959ac7a4cf27b4a64 Author: Nick Mathewson Date: Fri Mar 28 03:51:50 2014 -0400 Add 'rename' to the sandboxed syscalls (If we don't restrict rename, there's not much point in restricting open, since an attacker could always use rename to make us open

[tor-commits] [tor/master] Upgrade warning about missing interned string for sandbox

2014-04-16 Thread nickm
commit 739a52592bdb771d7ba4e40b6c9df84ea539f7fd Author: Nick Mathewson Date: Wed Apr 16 12:48:56 2014 -0400 Upgrade warning about missing interned string for sandbox --- src/common/sandbox.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/sandbox.c b/src

[tor-commits] [tor/master] Close orconns correctly through channels when setting DisableNetwork to 1

2014-04-16 Thread nickm
commit a5544e589d1724fc2765b277da736bbb2a9a8299 Author: Andrea Shepard Date: Tue Apr 15 20:19:39 2014 -0700 Close orconns correctly through channels when setting DisableNetwork to 1 --- changes/bug11306|4 src/or/connection.c | 14 ++ 2 files changed, 18 insertio

[tor-commits] [tor/master] Attribute 13304 and 13306 to 0.2.4.4-alpha.

2014-04-16 Thread nickm
commit 250b84b8a8b3bc9d50859459054aecfe8473e7cc Author: Nick Mathewson Date: Wed Apr 16 23:14:56 2014 -0400 Attribute 13304 and 13306 to 0.2.4.4-alpha. --- changes/bug11304 |2 +- changes/bug11306 |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/bug1130

[tor-commits] [tor/master] Call connection_or_close_for_error() properly if write_to_buf() ever fails on an orconn

2014-04-16 Thread nickm
commit 6ee9138576ae289c4ed726ddbb7b3f547f111f70 Author: Andrea Shepard Date: Tue Apr 15 21:25:49 2014 -0700 Call connection_or_close_for_error() properly if write_to_buf() ever fails on an orconn --- changes/bug11304|5 + src/or/connection.c |6 ++ 2 files changed, 11

[tor-commits] [tor/master] Merge remote-tracking branch 'andrea/bug11306'

2014-04-16 Thread nickm
commit 74ddd5f739696749409c933f82cf3a93152da6cc Merge: 10174b0 f36e932 Author: Nick Mathewson Date: Wed Apr 16 23:13:27 2014 -0400 Merge remote-tracking branch 'andrea/bug11306' changes/bug11306|4 src/or/config.c |5 - src/or/connection.c | 14 ++ 3

[tor-commits] [tor/master] Avoid redundant calls to connection_mark_for_close() on listeners when setting DisableNetwork to 1

2014-04-16 Thread nickm
commit f36e93206a20b37321b372802032d3dec481856d Author: Andrea Shepard Date: Tue Apr 15 20:35:31 2014 -0700 Avoid redundant calls to connection_mark_for_close() on listeners when setting DisableNetwork to 1 --- src/or/config.c |5 - 1 file changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge remote-tracking branch 'andrea/bug11304'

2014-04-16 Thread nickm
commit c856193199151bf26208981f63ca723f9c4cf5d6 Merge: 74ddd5f 6ee9138 Author: Nick Mathewson Date: Wed Apr 16 23:13:30 2014 -0400 Merge remote-tracking branch 'andrea/bug11304' changes/bug11304|5 + src/or/connection.c |6 ++ 2 files changed, 11 insertions(+)

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

2014-04-16 Thread nickm
commit 10174b00e7258cc8184e85c37a2a39b04a0df92e Merge: 9736613 64f6288 Author: Nick Mathewson Date: Wed Apr 16 23:06:39 2014 -0400 Merge remote-tracking branch 'public/bug11477' changes/bug11477 |4 configure.ac | 19 +-- 2 files changed, 17 insertions(+), 6

[tor-commits] [tor/master] New --enable-expensive-hardening option

2014-04-16 Thread nickm
commit 64f62881d8578ebf98d35d2731f7e6b51a565a09 Author: Nick Mathewson Date: Mon Apr 14 17:10:34 2014 -0400 New --enable-expensive-hardening option It turns on -fsanitize=address and -fsanitize=ubsan if they work. Most relays won't want this. Some clients may. Ticket 1147

[tor-commits] [tor/master] Changes file for 10896

2014-04-16 Thread nickm
commit f9719b078141fb1a4a0eee281031c73cffde7c30 Author: Nick Mathewson Date: Thu Apr 3 17:05:31 2014 -0400 Changes file for 10896 --- changes/10896 |8 1 file changed, 8 insertions(+) diff --git a/changes/10896 b/changes/10896 new file mode 100644 index 000..278815e --- /

[tor-commits] [tor/master] ipfw TransPort support on FreeBSD (10267)

2014-04-16 Thread nickm
commit 3e4680f3126c2a06358535b08bf267dca1bb90a7 Author: Nick Mathewson Date: Mon Feb 3 14:09:07 2014 -0500 ipfw TransPort support on FreeBSD (10267) This isn't on by default; to get it, you need to set "TransProxyType ipfw". (The original patch had automatic detection for whet

[tor-commits] [tor/master] Call pf-divert openbsd-specific, not no-linux

2014-04-16 Thread nickm
commit 89e520e2a710267c32b5afa03d32924646f78b28 Author: Nick Mathewson Date: Thu Apr 3 17:00:22 2014 -0400 Call pf-divert openbsd-specific, not no-linux --- src/or/config.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index f0

[tor-commits] [tor/master] Whitespace, doc fixes

2014-04-16 Thread nickm
commit db8259c23035a802610ece3dd437cd3ccc32ac9d Author: Nick Mathewson Date: Thu Apr 3 16:41:54 2014 -0400 Whitespace, doc fixes --- src/or/config.c |3 ++- src/or/connection_edge.c |5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/or/config.c b/

[tor-commits] [tor/master] tor_addr_from_sockaddr() is applicable in ipfw code, so use it.

2014-04-16 Thread nickm
commit 08ef8c0958ebeb134e4f29d1738c85c0ac81e71d Author: Nick Mathewson Date: Mon Feb 3 14:13:08 2014 -0500 tor_addr_from_sockaddr() is applicable in ipfw code, so use it. --- src/or/connection_edge.c | 10 +- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/or/con

[tor-commits] [tor/master] Merge branch '10267_plus_10896_rebased_twice'

2014-04-16 Thread nickm
commit 973661394abc393e3dfd5b82de86659ecadc72a4 Merge: 211b8cc f9719b0 Author: Nick Mathewson Date: Wed Apr 16 23:03:41 2014 -0400 Merge branch '10267_plus_10896_rebased_twice' changes/10267_tproxy |4 +++ changes/10896|8 + doc/tor.1.txt| 17

[tor-commits] [tor/master] Educate tor on OpenBSD's use of divert-to rules with the pf firewall.

2014-04-16 Thread nickm
commit f680d0fdd2e42bce109219ed78d0527d16995415 Author: dana koch Date: Mon Feb 10 21:23:51 2014 +1100 Educate tor on OpenBSD's use of divert-to rules with the pf firewall. This means that tor can run without needing to communicate with ioctls to the firewall, and therefore doe

[tor-commits] [tor/master] Fix OSX compilation.

2014-04-16 Thread nickm
commit c00c45fee133cbb21f69321fa7715a9f7d91164d Author: Nick Mathewson Date: Thu Apr 3 16:54:31 2014 -0400 Fix OSX compilation. --- src/or/connection_edge.c |4 1 file changed, 4 insertions(+) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index f294842..a8ad9ec

[tor-commits] [tor/master] Only expose clean_backtrace() if we'll implement it

2014-04-16 Thread nickm
commit 211b8cc31846e2d2ba75f19ab9f319f18cb70cfb Author: Nick Mathewson Date: Wed Apr 16 22:00:13 2014 -0400 Only expose clean_backtrace() if we'll implement it Fixes windows compilation; bug not in any released Tor. Bugfix on cc9e86db. --- src/common/backtrace.h |3 ++

[tor-commits] [tor/master] Update the authority signing key blacklist

2014-04-16 Thread nickm
commit 2ce0750d21d04c39a5a948b3d96203d8f68ae7ad Author: Nick Mathewson Date: Wed Apr 16 13:31:40 2014 -0400 Update the authority signing key blacklist Now it only has dannenberg --- src/or/routerlist.c |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/s

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

2014-04-16 Thread nickm
commit 438a03ef7c1aec6a9a92a74dafe127fa3f52a4e6 Merge: 125c8e5 3fc0f9e Author: Nick Mathewson Date: Wed Apr 16 15:37:19 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' src/or/routerlist.c |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-)

[tor-commits] [tor/master] remove note about dannenberg; it has upgraded.

2014-04-16 Thread nickm
commit ef3d7f2f97caf961effd7935dd3231e6bba62ca5 Author: Nick Mathewson Date: Wed Apr 16 14:56:49 2014 -0400 remove note about dannenberg; it has upgraded. --- src/or/routerlist.c |1 - 1 file changed, 1 deletion(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index afa5861..

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

2014-04-16 Thread nickm
commit 3fc0f9efb8b0030bab2574e5998a964adc93ebaa Merge: f050cf7 ef3d7f2 Author: Nick Mathewson Date: Wed Apr 16 14:57:14 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 src/or/routerlist.c |1 - 1 file changed, 1 deletion(-) ___

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

2014-04-16 Thread nickm
commit f050cf75b0d963be1aa2840bcef60c8b1e96d3b6 Merge: f3c20a2 2ce0750 Author: Nick Mathewson Date: Wed Apr 16 13:32:20 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 src/or/routerlist.c |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) ___

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

2014-04-16 Thread nickm
commit 3fc0f9efb8b0030bab2574e5998a964adc93ebaa Merge: f050cf7 ef3d7f2 Author: Nick Mathewson Date: Wed Apr 16 14:57:14 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 src/or/routerlist.c |1 - 1 file changed, 1 deletion(-) __

[tor-commits] [tor/maint-0.2.4] remove note about dannenberg; it has upgraded.

2014-04-16 Thread nickm
commit ef3d7f2f97caf961effd7935dd3231e6bba62ca5 Author: Nick Mathewson Date: Wed Apr 16 14:56:49 2014 -0400 remove note about dannenberg; it has upgraded. --- src/or/routerlist.c |1 - 1 file changed, 1 deletion(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index afa5861..

[tor-commits] [tor/maint-0.2.3] remove note about dannenberg; it has upgraded.

2014-04-16 Thread nickm
commit ef3d7f2f97caf961effd7935dd3231e6bba62ca5 Author: Nick Mathewson Date: Wed Apr 16 14:56:49 2014 -0400 remove note about dannenberg; it has upgraded. --- src/or/routerlist.c |1 - 1 file changed, 1 deletion(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index afa5861..

[tor-commits] [tor/maint-0.2.4] Update the authority signing key blacklist

2014-04-16 Thread nickm
commit 2ce0750d21d04c39a5a948b3d96203d8f68ae7ad Author: Nick Mathewson Date: Wed Apr 16 13:31:40 2014 -0400 Update the authority signing key blacklist Now it only has dannenberg --- src/or/routerlist.c |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/s

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

2014-04-16 Thread nickm
commit f050cf75b0d963be1aa2840bcef60c8b1e96d3b6 Merge: f3c20a2 2ce0750 Author: Nick Mathewson Date: Wed Apr 16 13:32:20 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 src/or/routerlist.c |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) __

[tor-commits] [tor/maint-0.2.3] Update the authority signing key blacklist

2014-04-16 Thread nickm
commit 2ce0750d21d04c39a5a948b3d96203d8f68ae7ad Author: Nick Mathewson Date: Wed Apr 16 13:31:40 2014 -0400 Update the authority signing key blacklist Now it only has dannenberg --- src/or/routerlist.c |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/s

[tor-commits] r26713: {website} remove the other nav link to the tor store. (website/trunk/en)

2014-04-16 Thread Andrew Lewman
Author: phobos Date: 2014-04-16 16:29:07 + (Wed, 16 Apr 2014) New Revision: 26713 Modified: website/trunk/en/navigation.wmi Log: remove the other nav link to the tor store. Modified: website/trunk/en/navigation.wmi === --- we

[tor-commits] r26712: {website} remove tor store from the top nav (website/trunk/include)

2014-04-16 Thread Andrew Lewman
Author: phobos Date: 2014-04-16 16:25:02 + (Wed, 16 Apr 2014) New Revision: 26712 Modified: website/trunk/include/navigation.wmi Log: remove tor store from the top nav Modified: website/trunk/include/navigation.wmi === --- we

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2014-04-16 Thread translation
commit a0ebd94039a3c8d40bf61ead3b6cc580a763ea1d Author: Translation commit bot Date: Wed Apr 16 13:45:22 2014 + Update translations for liveusb-creator --- pa/pa.po | 47 --- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/p

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

2014-04-16 Thread translation
commit c5dd2f0c2d740befebd6a50988f8071fb2c11c5e Author: Translation commit bot Date: Wed Apr 16 13:45:17 2014 + Update translations for https_everywhere --- pa/https-everywhere.dtd |2 +- pa/ssl-observatory.dtd |8 2 files changed, 5 insertions(+), 5 deletions(-) dif

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

2014-04-16 Thread translation
commit 40e6bf786f4829f703c1b9e4f8217ffe523cbf58 Author: Translation commit bot Date: Wed Apr 16 13:45:25 2014 + Update translations for tails-persistence-setup --- pa/pa.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pa/pa.po b/pa/pa.po index 2c546b7..24d

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

2014-04-16 Thread translation
commit ddab9ce1b7d6c5a55bcf4076a93cf6bde7f26b90 Author: Translation commit bot Date: Wed Apr 16 13:45:42 2014 + Update translations for tor-launcher-network-settings --- pa/network-settings.dtd |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pa/network-sett

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

2014-04-16 Thread translation
commit 4e74a448243336f7dfed2c06572f67dd02c4985c Author: Translation commit bot Date: Wed Apr 16 13:45:59 2014 + Update translations for tails-iuk --- pa.po | 29 +++-- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pa.po b/pa.po index 5262a9f.

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

2014-04-16 Thread translation
commit 38993380cd660131b9aee2bf4a4b194168e3e440 Author: Translation commit bot Date: Wed Apr 16 13:45:28 2014 + Update translations for tails-greeter --- pa/pa.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pa/pa.po b/pa/pa.po index 8a08790..337cfab 10064

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2014-04-16 Thread translation
commit 3fe5e5ace06962573c97181434c7fabb927b5340 Author: Translation commit bot Date: Wed Apr 16 13:45:35 2014 + Update translations for mat-gui --- pa.po | 69 + 1 file changed, 35 insertions(+), 34 deletions(-) diff --

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

2014-04-16 Thread translation
commit d5aea68b127082ae08ee56a1cfd6f94d3ec44806 Author: Translation commit bot Date: Wed Apr 16 13:45:45 2014 + Update translations for tails-misc --- pa.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pa.po b/pa.po index 3193096..9f75dd8 100644 --- a/pa.po ++

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

2014-04-16 Thread translation
commit 12553a7dd04f36af77eecb7e41037ab46163e79c Author: Translation commit bot Date: Wed Apr 16 13:45:05 2014 + Update translations for gettor --- pa/gettor.po | 504 ++ 1 file changed, 504 insertions(+) diff --git a/pa/gettor.p

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

2014-04-16 Thread translation
commit 36fde478d62f4b43ad9e4c5a15c93d8b77c3ac8b Author: Translation commit bot Date: Wed Apr 16 13:15:35 2014 + Update translations for torbirdy --- pa/torbirdy.dtd| 36 ++-- pa/torbirdy.properties |6 +++--- 2 files changed, 21 insertions(

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

2014-04-16 Thread translation
commit b36a959a8bb353ca17d69c40969babfead0daf4e Author: Translation commit bot Date: Wed Apr 16 13:15:53 2014 + Update translations for tails-misc --- pa.po | 73 + 1 file changed, 37 insertions(+), 36 deletions(-) diff

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

2014-04-16 Thread translation
commit bf40a92db7d4c2e5a29a692a3cf7054ff1096244 Author: Translation commit bot Date: Wed Apr 16 13:15:26 2014 + Update translations for tails-persistence-setup --- pa/pa.po | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --

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

2014-04-16 Thread translation
commit 6d0cc0dee2f477543fa3eb89522cab3d1c2aebe6 Author: Translation commit bot Date: Wed Apr 16 13:15:30 2014 + Update translations for tails-greeter --- pa/pa.po | 61 +++-- 1 file changed, 31 insertions(+), 30 deletions(-) di

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

2014-04-16 Thread translation
commit 25efdb2d6df256ff4ce7eff60625fd0991fa9908 Author: Translation commit bot Date: Wed Apr 16 13:16:00 2014 + Update translations for torbutton-brandproperties --- pa/brand.properties | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pa/brand.prop

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

2014-04-16 Thread translation
commit 8b9c7e12c71ba99e717c61a2d0914edf4062ded2 Author: Translation commit bot Date: Wed Apr 16 13:16:05 2014 + Update translations for torbutton-branddtd --- pa/brand.dtd |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pa/brand.dtd b/pa/brand.dtd index 7

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

2014-04-16 Thread translation
commit 4aae73cf703464e94cf3e36d44ea5faa0d3ae5b4 Author: Translation commit bot Date: Wed Apr 16 13:16:03 2014 + Update translations for torbutton-brandproperties_completed --- pa/brand.properties | 15 +++ 1 file changed, 15 insertions(+) diff --git a/pa/brand.properties

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

2014-04-16 Thread translation
commit 15d1a64c2c6938d03892d52bb46c8599729abd92 Author: Translation commit bot Date: Wed Apr 16 13:16:10 2014 + Update translations for torbutton-browserproperties --- pa/browser.properties |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pa/browser.proper

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2014-04-16 Thread translation
commit 461050b73f9bed546243d0214fcbcf27c8228b57 Author: Translation commit bot Date: Wed Apr 16 13:15:57 2014 + Update translations for abouttor-homepage --- pa/aboutTor.dtd | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pa/

  1   2   >