[tor-commits] [tor-browser-bundle/master] Unset TOR_CONTROL_PASSWD in setControlPassword() if autoset to 'secret'.

2014-07-16 Thread gk
commit 798f147f44ff80d2104ed3b0162f17198dd2a4f2 Author: Isis Lovecruft i...@torproject.org Date: Wed Jul 16 02:33:00 2014 + Unset TOR_CONTROL_PASSWD in setControlPassword() if autoset to 'secret'. * FIXES #12624, a bug caused by the TOR_CONTROL_PASSWD being by default

[tor-commits] [bridgedb/develop] Fix bug shown in test_Unscheduled_getInterval_is_constant() unittest.

2014-07-16 Thread isis
commit a7551e22cc141d48bd7498afcc07d4378c0c0fcc Author: Isis Lovecruft i...@torproject.org Date: Wed Jul 16 04:13:30 2014 + Fix bug shown in test_Unscheduled_getInterval_is_constant() unittest. * FIXES an additional problem for #12147 pointed out by Robert Ransom's

[tor-commits] [bridgedb/develop] Merge branch 'rransom/fix/12147-schedule-unittest' into develop

2014-07-16 Thread isis
commit 91142d6c02aa7304d03d768c076aea1ad230db53 Merge: 024c978 a7551e2 Author: Isis Lovecruft i...@torproject.org Date: Wed Jul 16 06:52:29 2014 + Merge branch 'rransom/fix/12147-schedule-unittest' into develop lib/bridgedb/schedule.py |7 ++-

[tor-commits] [bridgedb/develop] Fix test suite for bridgedb.scheduled.Unscheduled

2014-07-16 Thread isis
commit a9e65a0c9c3e40359731b6fe3408e068f9c1501a Author: Robert Ransom rransom.8...@gmail.com Date: Tue Jul 15 04:04:46 2014 -0400 Fix test suite for bridgedb.scheduled.Unscheduled Previously, the test suite checked only that Unscheduled.getInterval would return a particular

[tor-commits] [tor/master] add changes file for 12503

2014-07-16 Thread nickm
commit 7bc7188fc94f6662690e07039b4e01dd8a92cdbc Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 09:52:37 2014 +0200 add changes file for 12503 --- changes/bug12503 |3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug12503 b/changes/bug12503 new file mode

[tor-commits] [tor/master] Fixed fgets_eagain unit test.

2014-07-16 Thread nickm
commit 61507417919d88eb7ee2e3fc877f751be2a6bfa3 Author: cypherpunks cypherpu...@torproject.org Date: Wed Jul 16 09:50:09 2014 +0200 Fixed fgets_eagain unit test. On a non-blocking pipe fgets sets EAGAIN when it encounters partial lines. No error is set on full lines or EOF.

[tor-commits] [tor/maint-0.2.5] Add another 8387 diagnostic

2014-07-16 Thread nickm
commit 32495ee3099c3fb512a986a8e5db32ebf153b439 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 10:05:00 2014 +0200 Add another 8387 diagnostic When we run into bug 8387 (if we run into it again), report when we last called circuit_expire_old_circuits_clientside().

[tor-commits] [tor/maint-0.2.5] Merge remote-tracking branch 'public/bug8387_024' into maint-0.2.5

2014-07-16 Thread nickm
commit 856114ab1c5a8a7a1b7993ee34adbb7cbf4eaa10 Merge: 35791f4 ed3d789 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 10:01:56 2014 +0200 Merge remote-tracking branch 'public/bug8387_024' into maint-0.2.5 changes/bug8387 | 11 +++ src/or/circuituse.c | 27

[tor-commits] [tor/maint-0.2.5] Fix a bug where streams would linger forever when we had no dirinfo

2014-07-16 Thread nickm
commit ed3d7892c721c9495215ecad2e18c026d29fbb9b Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 9 16:14:14 2014 -0400 Fix a bug where streams would linger forever when we had no dirinfo fixes bug 8387; fix on 0.1.1.11-alpha (code), or on 0.2.4.10-alpha (behavior). ---

[tor-commits] [tor/maint-0.2.5] diagnostic for 12184: Add a call to channel_dump_statistics

2014-07-16 Thread nickm
commit 5d2045ee8ba42a294291b187234be6ead6864cab Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 10:34:39 2014 +0200 diagnostic for 12184: Add a call to channel_dump_statistics --- changes/further-12184-diagnostic |2 ++ src/or/circuitbuild.c|2 ++ 2 files

[tor-commits] [tor/maint-0.2.5] configure.ac: fix build with --enable-bufferevents

2014-07-16 Thread nickm
commit 589de5ec20bf6f15813fc3bddb7a814309184800 Author: Anthony G. Basile bluen...@gentoo.org Date: Fri Jun 20 08:47:26 2014 -0400 configure.ac: fix build with --enable-bufferevents When building with bufferevents enabled, configure.ac throws an error if

[tor-commits] [tor/maint-0.2.5] src/or/connection.c: expose bucket_millis_empty for bufferevents test

2014-07-16 Thread nickm
commit d504a4e36f571a5b6ed84529d3781d08df82f117 Author: Anthony G. Basile bluen...@gentoo.org Date: Thu Jun 26 11:15:36 2014 -0400 src/or/connection.c: expose bucket_millis_empty for bufferevents test Currently tor fails to build its test when enabled with bufferevents because

[tor-commits] [tor/maint-0.2.5] changes file for 12474, 12438.

2014-07-16 Thread nickm
commit 9e46855538e9b848b7c37fda502e5d109079cee0 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 11:00:49 2014 +0200 changes file for 12474, 12438. --- changes/bufferevent_compilation |5 + 1 file changed, 5 insertions(+) diff --git a/changes/bufferevent_compilation

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

2014-07-16 Thread nickm
commit 7591ce64fbaae8d480224a93d62abda10011c2ba Merge: 7bc7188 9e46855 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 11:01:20 2014 +0200 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bufferevent_compilation |5 changes/bug8387 | 11

[tor-commits] [tor/master] src/or/connection.c: expose bucket_millis_empty for bufferevents test

2014-07-16 Thread nickm
commit d504a4e36f571a5b6ed84529d3781d08df82f117 Author: Anthony G. Basile bluen...@gentoo.org Date: Thu Jun 26 11:15:36 2014 -0400 src/or/connection.c: expose bucket_millis_empty for bufferevents test Currently tor fails to build its test when enabled with bufferevents because

[tor-commits] [tor/master] Add another 8387 diagnostic

2014-07-16 Thread nickm
commit 32495ee3099c3fb512a986a8e5db32ebf153b439 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 10:05:00 2014 +0200 Add another 8387 diagnostic When we run into bug 8387 (if we run into it again), report when we last called circuit_expire_old_circuits_clientside().

[tor-commits] [tor/master] configure.ac: fix build with --enable-bufferevents

2014-07-16 Thread nickm
commit 589de5ec20bf6f15813fc3bddb7a814309184800 Author: Anthony G. Basile bluen...@gentoo.org Date: Fri Jun 20 08:47:26 2014 -0400 configure.ac: fix build with --enable-bufferevents When building with bufferevents enabled, configure.ac throws an error if

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug8387_024' into maint-0.2.5

2014-07-16 Thread nickm
commit 856114ab1c5a8a7a1b7993ee34adbb7cbf4eaa10 Merge: 35791f4 ed3d789 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 10:01:56 2014 +0200 Merge remote-tracking branch 'public/bug8387_024' into maint-0.2.5 changes/bug8387 | 11 +++ src/or/circuituse.c | 27

[tor-commits] [tor/master] Remove executable bit from control.c, router.c

2014-07-16 Thread nickm
commit 35791f4238bd6853c038d5fc68976dd74c93c577 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 9 08:54:08 2014 -0400 Remove executable bit from control.c, router.c Fix for 12512. --- 0 files changed diff --git a/src/or/control.c b/src/or/control.c old mode 100755 new

[tor-commits] [tor/master] changes file for 12474, 12438.

2014-07-16 Thread nickm
commit 9e46855538e9b848b7c37fda502e5d109079cee0 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 11:00:49 2014 +0200 changes file for 12474, 12438. --- changes/bufferevent_compilation |5 + 1 file changed, 5 insertions(+) diff --git a/changes/bufferevent_compilation

[tor-commits] [tor/master] Fix a bug where streams would linger forever when we had no dirinfo

2014-07-16 Thread nickm
commit ed3d7892c721c9495215ecad2e18c026d29fbb9b Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 9 16:14:14 2014 -0400 Fix a bug where streams would linger forever when we had no dirinfo fixes bug 8387; fix on 0.1.1.11-alpha (code), or on 0.2.4.10-alpha (behavior). ---

[tor-commits] [tor/master] diagnostic for 12184: Add a call to channel_dump_statistics

2014-07-16 Thread nickm
commit 5d2045ee8ba42a294291b187234be6ead6864cab Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 10:34:39 2014 +0200 diagnostic for 12184: Add a call to channel_dump_statistics --- changes/further-12184-diagnostic |2 ++ src/or/circuitbuild.c|2 ++ 2 files

[tor-commits] [tor/master] Apply GeoIPExcludeUnknown before checking transitions

2014-07-16 Thread nickm
commit 4da4c4c63f02e9551eaeb8ad9ce5c6f2d1f34ef9 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 11:14:59 2014 +0200 Apply GeoIPExcludeUnknown before checking transitions Otherwise, it always seems as though our Exclude* options have changed, since we're comparing

[tor-commits] [tor/master] When making a tempdir for windows unit tests, avoid an extra backslash

2014-07-16 Thread nickm
commit 3f683aadcd03c311c1d987ab847a77dbe3fb2bf1 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 11:31:22 2014 +0200 When making a tempdir for windows unit tests, avoid an extra backslash The extra \ is harmless, but mildly unpleasant. Fixes 12392; bugfix on

[tor-commits] [tor/master] Add coverage-html makefile target

2014-07-16 Thread nickm
commit 8fa845548bc2883c6b1335b4815fa945964f517f Author: Kevin Murray s...@kdmurray.id.au Date: Wed Jul 9 18:37:32 2014 +1000 Add coverage-html makefile target This uses lcov to generate a nice HTML report of test code coverage, including branch coverage. Signed-off-by:

[tor-commits] [tor/master] Add stanza on lcov coverage target

2014-07-16 Thread nickm
commit eed942aed9175971b510f0f720274171f1895d01 Author: Kevin Murray s...@kdmurray.id.au Date: Wed Jul 9 18:55:44 2014 +1000 Add stanza on lcov coverage target Adds a note about using `make coverage-html` to generate coverage reports. Signed-off-by: Kevin Murray

[tor-commits] [tor/master] Tweak coverage-html target

2014-07-16 Thread nickm
commit 98541f2892335a5a512a6c01b2f2227bde1d649e Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 06:01:18 2014 -0400 Tweak coverage-html target - Don't try to rm -rf the directory before we start: somebody might have set it to ~, which would be quite sad.

[tor-commits] [tor/master] Clarify TruncateLogFile manpage entry

2014-07-16 Thread nickm
commit c793a6edb441fdad568c26dc417e98484c74f897 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 14:01:38 2014 +0200 Clarify TruncateLogFile manpage entry --- doc/tor.1.txt |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt

[tor-commits] [tor/master] Add an option to overwrite logs

2014-07-16 Thread nickm
commit 15e170e01b3f67325f952d0becda0438fa879907 Author: Arlo Breault arlo...@gmail.com Date: Sun Mar 23 09:24:26 2014 -0700 Add an option to overwrite logs * Issue #5583 --- changes/feature5583 |2 ++ doc/tor.1.txt |3 +++ src/common/log.c| 15

[tor-commits] [tor/master] Add a tor_ftruncate to replace ftruncate.

2014-07-16 Thread nickm
commit 867f5e6a7602fe5cf54686aa04995eaabaea4c80 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 13:58:55 2014 +0200 Add a tor_ftruncate to replace ftruncate. (Windows doesn't have ftruncate, and some ftruncates do not move the file pointer to the start of the

[tor-commits] [tor/master] fix a c99-ism

2014-07-16 Thread nickm
commit 8c7fbdf3af2a28893ab68411d7d534792ccad34d Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 15:30:14 2014 +0200 fix a c99-ism --- src/common/log.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/log.c b/src/common/log.c index

[tor-commits] [tor/master] choose_random_entry_impl(): Remove useless consider_exit_family.

2014-07-16 Thread nickm
commit f75c6ce981a8e781c4c697d37094fe024f258b65 Author: George Kadianakis desnac...@riseup.net Date: Mon Jun 9 17:42:55 2014 +0100 choose_random_entry_impl(): Remove useless consider_exit_family. The variable was useless since it was only toggled off in disabled code. If

[tor-commits] [tor/master] Fix the functionality of populate_live_entry_guards().

2014-07-16 Thread nickm
commit a59429f1e49d2666d31ec9a3b34dd861c96cddaa Author: George Kadianakis desnac...@riseup.net Date: Mon Jun 9 18:23:07 2014 +0100 Fix the functionality of populate_live_entry_guards(). --- src/or/entrynodes.c | 48 ++-- 1 file changed, 38

[tor-commits] [tor/master] Move code from choose_random_entry_impl() to the new function.

2014-07-16 Thread nickm
commit 427cc8a4520e6ea93608957fd2aabe6364c678de Author: George Kadianakis desnac...@riseup.net Date: Mon Jun 9 18:04:39 2014 +0100 Move code from choose_random_entry_impl() to the new function. This commit only _moves_ code. --- src/or/entrynodes.c | 64

[tor-commits] [tor/master] Document choose_random_entry_impl() and populate_live_entry_guards().

2014-07-16 Thread nickm
commit 61629b4f6ccb06ec190c4078797fcb48d83208d5 Author: George Kadianakis desnac...@riseup.net Date: Sun Jun 15 19:02:35 2014 -0700 Document choose_random_entry_impl() and populate_live_entry_guards(). --- src/or/entrynodes.c | 40 +--- 1 file changed,

[tor-commits] [tor/master] Add the entrynodes.c unit tests.

2014-07-16 Thread nickm
commit a8fcdbf4a0fcea3c97431f0c2bcc5a7774764ed4 Author: George Kadianakis desnac...@riseup.net Date: Tue Jun 24 14:22:52 2014 -0400 Add the entrynodes.c unit tests. --- src/test/include.am|1 + src/test/test.c|2 + src/test/test_entrynodes.c | 572

[tor-commits] [tor/master] Functionify the descriptor age check so that we can NOP it in tests.

2014-07-16 Thread nickm
commit 4245662b28d04f2c7d51b8175031007a80f1c3e5 Author: George Kadianakis desnac...@riseup.net Date: Tue Jun 24 14:12:51 2014 -0400 Functionify the descriptor age check so that we can NOP it in tests. --- src/or/routerlist.c | 11 +-- src/or/routerlist.h |2 ++ 2 files

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

2014-07-16 Thread nickm
commit e669e910f46820350a31826368868bfd4b913e70 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 15:33:47 2014 +0200 changes file for 12207 --- changes/12207 |4 1 file changed, 4 insertions(+) diff --git a/changes/12207 b/changes/12207 new file mode 100644 index

[tor-commits] [tor/master] Add some test descriptors to src/test/.

2014-07-16 Thread nickm
commit 727ed5448a8e63fb8116bb691d55c99bc1ca03f6 Author: George Kadianakis desnac...@riseup.net Date: Sun Jun 15 18:39:31 2014 -0700 Add some test descriptors to src/test/. --- src/test/test_descriptors.txt | 304 + 1 file changed, 304 insertions(+)

[tor-commits] [tor/master] Make populate_live_entry_guards() more smoothly testable.

2014-07-16 Thread nickm
commit 71da44f159ae0a3b0d267673ab5a74b51a843dca Author: George Kadianakis desnac...@riseup.net Date: Mon Jun 9 19:14:40 2014 +0100 Make populate_live_entry_guards() more smoothly testable. --- src/or/entrynodes.c |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git

[tor-commits] [tor/master] Change interface of router_descriptor_is_too_old().

2014-07-16 Thread nickm
commit b74442db944be074785ce9590c34358959d7650a Author: George Kadianakis desnac...@riseup.net Date: Wed Jul 9 19:20:41 2014 +0300 Change interface of router_descriptor_is_too_old(). --- src/or/routerlist.c| 11 ++- src/or/routerlist.h|3 ++-

[tor-commits] [tor/master] Constify aggressively in populate_live_entry_guards().

2014-07-16 Thread nickm
commit c7b05a6aefc012b769443e7299e5a8fe13b32fa8 Author: George Kadianakis desnac...@riseup.net Date: Mon Jun 9 18:23:41 2014 +0100 Constify aggressively in populate_live_entry_guards(). --- src/or/entrynodes.c |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug12207_second_draft'

2014-07-16 Thread nickm
commit d8705ec720b201d6b21ed064d581b819a10734f7 Merge: 8c7fbdf b74442d Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 15:33:00 2014 +0200 Merge remote-tracking branch 'asn/bug12207_second_draft' src/or/entrynodes.c | 180 - src/or/entrynodes.h

[tor-commits] [tor/master] Remove a piece of disabled code in choose_random_entry_impl().

2014-07-16 Thread nickm
commit 115b3e76459cc24e0e0081eb76f1259063e327e7 Author: George Kadianakis desnac...@riseup.net Date: Mon Jun 9 17:39:21 2014 +0100 Remove a piece of disabled code in choose_random_entry_impl(). --- src/or/entrynodes.c | 16 1 file changed, 16 deletions(-) diff --git

[tor-commits] [tor/master] Create skeleton for populate_live_entry_guards().

2014-07-16 Thread nickm
commit e8c366e9ea2523bd78ab76432c3bea4e13d2c649 Author: George Kadianakis desnac...@riseup.net Date: Mon Jun 9 18:03:09 2014 +0100 Create skeleton for populate_live_entry_guards(). Now we are ready to move code from choose_random_entry_impl() to it. --- src/or/entrynodes.c | 10

[tor-commits] [tor/master] Merge remote-tracking branch 'sysrqb/bug12573'

2014-07-16 Thread nickm
commit f74a932e0b68205b180c6894b036ab3193144390 Merge: e669e91 43bba95 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 15:38:10 2014 +0200 Merge remote-tracking branch 'sysrqb/bug12573' changes/bug12573 |5 + src/or/dirserv.c |2 +- 2 files changed, 6

[tor-commits] [tor/master] Only active relays should be given HSDir

2014-07-16 Thread nickm
commit 43bba9541af26ababa4854fa960ffe0e37d920e9 Author: Matthew Finkel matthew.fin...@gmail.com Date: Wed Jul 9 00:08:09 2014 + Only active relays should be given HSDir We should only assign a relay the HSDir flag if it is currently considered valid. We can accomplish this

[tor-commits] [tor/master] Change the interface of entry_is_live() to take a bitmap.

2014-07-16 Thread nickm
commit 8bbb217964a8d3a2d77a69f670a53ff65643ff27 Author: George Kadianakis desnac...@riseup.net Date: Wed Jun 25 15:44:36 2014 -0400 Change the interface of entry_is_live() to take a bitmap. --- src/or/entrynodes.c| 41 - src/or/entrynodes.h

[tor-commits] [tor/master] Fix wide lines, make entry_is_live() non-inline

2014-07-16 Thread nickm
commit 5690284559af012c279e9b989497ccc2e03cfc70 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 16:52:16 2014 +0200 Fix wide lines, make entry_is_live() non-inline --- src/or/entrynodes.c|5 +++-- src/or/entrynodes.h|6 +++--- src/test/test_entrynodes.c

[tor-commits] [tor/master] Add a changes file for bug12202

2014-07-16 Thread nickm
commit 0ef5d4d633dc40ad12eaf65608325d1e5045b812 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 16:54:42 2014 +0200 Add a changes file for bug12202 --- changes/bug12202 |3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug12202 b/changes/bug12202 new file mode

[tor-commits] [tor/master] Basic entry_is_live() unittest.

2014-07-16 Thread nickm
commit 46d41e6e9b4208b1a951f2d7f14da92606b82195 Author: George Kadianakis desnac...@riseup.net Date: Wed Jun 25 15:39:00 2014 -0400 Basic entry_is_live() unittest. --- src/or/entrynodes.c|2 +- src/or/entrynodes.h|5 src/test/test_entrynodes.c | 62

[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug12202'

2014-07-16 Thread nickm
commit 368ff2291b0b400e0ee908ad465ed6f0f56330ec Merge: f74a932 8bbb217 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 16:49:07 2014 +0200 Merge remote-tracking branch 'asn/bug12202' src/or/entrynodes.c| 43 ++--- src/or/entrynodes.h|

[tor-commits] [tor/master] Check for orconns and use connection_or_close_for_error() when appropriate in connection_handle_write_impl()

2014-07-16 Thread nickm
commit 65a0f895c7dd913071bcba5f1876ccf3b1286892 Author: Andrea Shepard and...@torproject.org Date: Tue Apr 15 23:03:16 2014 -0700 Check for orconns and use connection_or_close_for_error() when appropriate in connection_handle_write_impl() --- changes/bug11302|4

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

2014-07-16 Thread nickm
commit b408125288ad6943d7ed3b468ad9179a93d1359c Merge: 0ef5d4d 65a0f89 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 16:58:41 2014 +0200 Merge remote-tracking branch 'andrea/bug11302' changes/bug11302|4 src/or/connection.c | 12 +--- 2 files changed,

[tor-commits] [obfsproxy/master] When in external mode, only call setup() of the transports we are launching.

2014-07-16 Thread asn
commit 3d636a9660ffef71f1ec3d5ecbe4179098ebcbd7 Author: George Kadianakis desnac...@riseup.net Date: Fri May 9 15:50:57 2014 +0100 When in external mode, only call setup() of the transports we are launching. --- ChangeLog|2 ++ obfsproxy/pyobfsproxy.py |7 --- 2

[tor-commits] [obfsproxy/master] Catch some exceptions in scramblesuit's setup() and fail gracefully.

2014-07-16 Thread asn
commit 879181dd50980a329f345b5784fc37cf1abecf6a Author: George Kadianakis desnac...@riseup.net Date: Fri May 9 15:39:58 2014 +0100 Catch some exceptions in scramblesuit's setup() and fail gracefully. Conflicts: obfsproxy/transports/scramblesuit/scramblesuit.py ---

[tor-commits] [obfsproxy/master] Fix path joining in scramblesuit/state.py.

2014-07-16 Thread asn
commit ee185b8904a6463e925e27df7e18e3e64e77b9fc Author: George Kadianakis desnac...@riseup.net Date: Tue Jul 15 16:42:15 2014 +0300 Fix path joining in scramblesuit/state.py. --- obfsproxy/transports/scramblesuit/state.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff

[tor-commits] [obfsproxy/master] Remove a broken unittest.

2014-07-16 Thread asn
commit 7418e247a720de23131725629135234aba8a299a Author: George Kadianakis desnac...@riseup.net Date: Tue Jul 15 16:45:47 2014 +0300 Remove a broken unittest. --- obfsproxy/test/transports/test_scramblesuit.py |7 --- 1 file changed, 7 deletions(-) diff --git

[tor-commits] [obfsproxy/master] Use temporary files instead of /tmp in scramblesuit unittests.

2014-07-16 Thread asn
commit 2296d90770fa6e67dde37228bd95492b79586a93 Author: George Kadianakis desnac...@riseup.net Date: Tue Jul 15 16:43:20 2014 +0300 Use temporary files instead of /tmp in scramblesuit unittests. Conflicts: obfsproxy/test/transports/test_scramblesuit.py ---

[tor-commits] [obfsproxy/master] Write password to a file, instead of the whole Bridge line.

2014-07-16 Thread asn
commit 52ffae96fbe3907644015be82de2b3a38f637ae2 Author: George Kadianakis desnac...@riseup.net Date: Fri May 9 15:32:55 2014 +0100 Write password to a file, instead of the whole Bridge line. Because of technical problems (see #10887:comment:11) it was not so easy to write the

[tor-commits] [doctor/master] Noting the authority that's missing signatures

2014-07-16 Thread atagar
commit 560d6cd671cb602a362ff491eefe9718ea66bea2 Author: Damian Johnson ata...@torproject.org Date: Wed Jul 16 09:41:48 2014 -0700 Noting the authority that's missing signatures We recently had an issue where clock skew on urras resulted in consensuses missing signatures. DocTor

[tor-commits] [tor-browser-bundle/master] Bug 12391: Get mingw-w64 compiled reliably.

2014-07-16 Thread gk
commit 5b71d6072028e0d582ad7405597fd615586a0734 Author: Georg Koppen g...@torproject.org Date: Wed Jul 16 19:24:48 2014 + Bug 12391: Get mingw-w64 compiled reliably. It seems libfaketime is the culprit for the intermittent build failures (which might be nothing else than an

[tor-commits] [tor-browser-bundle/maint-3.6] Bump 3.6 to Firefox 27.7.0.

2014-07-16 Thread mikeperry
commit aff7663db9ef47c782f5001ee9869157e6bd0816 Author: Mike Perry mikeperry-...@torproject.org Date: Wed Jul 16 11:51:36 2014 -0700 Bump 3.6 to Firefox 27.7.0. --- gitian/versions |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions

[tor-commits] [tor/master] Fix tests when building out-of-tree

2014-07-16 Thread nickm
commit facecce176c8fe15653676557c6151c4ea1ca994 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 21:07:22 2014 +0200 Fix tests when building out-of-tree (This was too hard. Silly autoconf.) --- configure.ac |8 src/test/test_entrynodes.c |

[tor-commits] [tor/master] Move test_descriptors.txt to an include file

2014-07-16 Thread nickm
commit 7259e3f6049c7a644cb1c797432d29b57a5c0589 Author: Nick Mathewson ni...@torproject.org Date: Wed Jul 16 22:37:00 2014 +0200 Move test_descriptors.txt to an include file Making the text file work out-of-tree didn't work on windows. Maybe we can get it working that way

[tor-commits] r26875: {website} apply patch from ticket 12637 (website/trunk/press/en)

2014-07-16 Thread Andrew Lewman
Author: phobos Date: 2014-07-17 01:47:25 + (Thu, 17 Jul 2014) New Revision: 26875 Modified: website/trunk/press/en/press.wml Log: apply patch from ticket 12637 Modified: website/trunk/press/en/press.wml === ---