[tor-commits] [tor-browser-bundle/master] We want to have nightlies with the new OpenSSL.

2014-08-20 Thread gk
commit 81d698cab574c6fa278836b695b79752bf94 Author: Georg Koppen g...@torproject.org Date: Wed Aug 20 11:27:35 2014 + We want to have nightlies with the new OpenSSL. --- gitian/versions.nightly |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2014-08-20 Thread translation
commit 37134b716123ac00ec9f48776332e314d859ea99 Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 09:45:26 2014 + Update translations for torbirdy --- es_AR/torbirdy.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es_AR/torbirdy.dtd

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

2014-08-20 Thread translation
commit 756f00f0ef2010d49fce4e0aeb704f8eb1b2d9b4 Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 09:45:32 2014 + Update translations for tor-launcher-properties --- es_AR/torlauncher.properties |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff

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

2014-08-20 Thread translation
commit 088e1272583248d88b7af9d42294ddb47035e76d Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 09:45:35 2014 + Update translations for tor-launcher-properties_completed --- es_AR/torlauncher.properties |6 +++--- 1 file changed, 3 insertions(+), 3

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

2014-08-20 Thread translation
commit 181585e701a1858681c510abc0dc208713ebde48 Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 10:45:46 2014 + Update translations for torbutton-torbuttonproperties --- es/torbutton.properties|8 zh_CN/torbutton.properties |8 2

[tor-launcher/master] Bug 12444: Feedback when “Copy Tor Log” is clicked.

2014-08-20 Thread brade
commit 561440e8d64ca9b60f09d2b6869c4d07c5d06834 Author: Kathy Brade br...@pearlcrescent.com Date: Wed Aug 20 08:21:45 2014 -0400 Bug 12444: Feedback when “Copy Tor Log” is clicked. Show a transient popup near the Copy Tor Log To Clipboard button after is is clicked. The

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

2014-08-20 Thread translation
commit f195dbdb2981c9f59f2502268347ac0758accaae Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 12:45:51 2014 + Update translations for torbutton-torbuttonproperties --- nl/torbutton.properties |8 1 file changed, 4 insertions(+), 4 deletions(-)

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

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

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

2014-08-20 Thread translation
commit 3cd3e72ecfea6f0ae46038decb321f866d91a178 Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 12:45:35 2014 + Update translations for tor-launcher-properties_completed --- nl/torlauncher.properties |6 +++--- 1 file changed, 3 insertions(+), 3

[tor-commits] [tor/master] Fix relay_command_to_string(); solve 12700.

2014-08-20 Thread nickm
commit 1196ed7cc4fc202e43ca102a73befe62aa65767d Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 18 13:19:43 2014 -0400 Fix relay_command_to_string(); solve 12700. Two bugs here: 1) We didn't add EXTEND2/EXTENDED2 to relay_command_to_string(). 2)

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

2014-08-20 Thread nickm
commit 764cebb4d9a3f7b16d4735b9ef8a656bc921e217 Merge: 2937de2 1196ed7 Author: Nick Mathewson ni...@torproject.org Date: Wed Aug 20 09:00:41 2014 -0400 Merge remote-tracking branch 'public/bug12700_024' changes/bug12700 | 10 ++ src/or/relay.c |8 +++- 2 files changed,

[tor-commits] [obfs4/master] Add a missing continue statement.

2014-08-20 Thread yawning
commit dd9fdee55d75e23fff97177999b7fd16613fa27a Author: Yawning Angel yawn...@torproject.org Date: Wed Aug 20 13:43:43 2014 + Add a missing continue statement. Caught by asn, thanks. --- obfs4proxy/obfs4proxy.go |1 + 1 file changed, 1 insertion(+) diff --git

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

2014-08-20 Thread translation
commit 67bcc92eeb3c2131b908d329ec6a6bd7bb5b2f2b Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 13:45:43 2014 + Update translations for torbutton-torbuttonproperties --- tr/torbutton.properties | 10 +- 1 file changed, 5 insertions(+), 5

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

2014-08-20 Thread translation
commit c1fa9d6c9f976d186a4038471ea198672faebaa7 Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 15:45:30 2014 + Update translations for tor-launcher-properties --- cs/torlauncher.properties |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff

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

2014-08-20 Thread translation
commit b60cc997afb9b62344117828d81a4c433cc174e7 Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 15:45:33 2014 + Update translations for tor-launcher-properties_completed --- cs/torlauncher.properties |5 +++-- 1 file changed, 3 insertions(+), 2

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

2014-08-20 Thread translation
commit 979a0f878e6ff170f3b8089707da9a9634acd338 Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 15:45:41 2014 + Update translations for tor-launcher-network-settings_completed --- cs/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1

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

2014-08-20 Thread translation
commit 5582b565621b8f52f1dd2f92f61079bf1aad922d Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 15:45:55 2014 + Update translations for torbutton-torbuttonproperties --- fr_CA/torbutton.properties |8 1 file changed, 4 insertions(+), 4

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

2014-08-20 Thread translation
commit 1a49dda383d9fe780a36cb48ebcbdf268e51576c Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 15:45:37 2014 + Update translations for tor-launcher-network-settings --- cs/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

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

2014-08-20 Thread translation
commit 2c60a6615e6d4ec7bc24cd2e0b87d97e74163fb2 Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 16:15:22 2014 + Update translations for tails-persistence-setup --- cs/cs.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs/cs.po

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

2014-08-20 Thread translation
commit 2f8862c927d9b8dd6dccf7c78432817157628282 Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 16:15:09 2014 + Update translations for torcheck --- cs/torcheck.po |9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cs/torcheck.po

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

2014-08-20 Thread translation
commit d4403b6f0634ddb9f99644343ba273268c53ee16 Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 16:15:25 2014 + Update translations for tails-persistence-setup_completed --- cs/cs.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2014-08-20 Thread translation
commit 2700235bbf2f7d4bcb4157165117b138731c796f Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 16:15:27 2014 + Update translations for tails-greeter --- cs/cs.po | 31 --- 1 file changed, 16 insertions(+), 15 deletions(-) diff

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

2014-08-20 Thread translation
commit 68af6df57816ef4a0b9fe07f05526c43973e02b6 Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 16:15:38 2014 + Update translations for tor-launcher-properties --- cs/torlauncher.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2014-08-20 Thread translation
commit 7f5eca6212c89a768c1e3f50d9522a3591c61c25 Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 16:15:40 2014 + Update translations for tor-launcher-properties_completed --- cs/torlauncher.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

2014-08-20 Thread translation
commit 7ac36b40c62bf492fae7b19faa51e3a0890937b8 Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 16:15:30 2014 + Update translations for tails-greeter_completed --- cs/cs.po | 35 ++- 1 file changed, 18 insertions(+), 17

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

2014-08-20 Thread translation
commit 52a2b67e981448bbf724e0cfeff9087b5f607cd7 Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 16:16:00 2014 + Update translations for tails-iuk --- cs.po | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cs.po b/cs.po

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

2014-08-20 Thread translation
commit a17bba98779a845f90c1a4792188ab693fe2a275 Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 16:15:57 2014 + Update translations for torbutton-torbuttonproperties --- cs/torbutton.properties|6 +++--- pt_BR/torbutton.properties |8 2

[tor-commits] [tor/master] Fix entrynodes test fails because of outdated test vectors.

2014-08-20 Thread nickm
commit d28670c94fb6482cfbd5117b001f076dbb9b9f41 Author: George Kadianakis desnac...@riseup.net Date: Wed Aug 20 17:07:19 2014 +0300 Fix entrynodes test fails because of outdated test vectors. --- src/test/test_entrynodes.c | 17 +++-- 1 file changed, 15 insertions(+), 2

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

2014-08-20 Thread nickm
commit d0009cb8e8bd2a6f1c84f9f117a71f84045fdfce Merge: d28670c 0400744 Author: Nick Mathewson ni...@torproject.org Date: Wed Aug 20 12:44:15 2014 -0400 Merge remote-tracking branch 'public/bug12728_024' changes/bug12728 |4 src/or/router.c |2 +- 2 files changed, 5

[tor-commits] [tor/master] Correctly remove extraneous space in router family lines

2014-08-20 Thread nickm
commit 04007448b9f318f4c3517ce173272f756a02f28c Author: Nick Mathewson ni...@torproject.org Date: Tue Aug 5 11:09:08 2014 -0400 Correctly remove extraneous space in router family lines Fixes bug 12728; bugfix on 0.2.1.7-alpha when the SPLIT_IGNORE_SPACE option was added. ---

[tor-commits] [tor/master] Warn if Tor is a relay and a HS

2014-08-20 Thread nickm
commit a3fe8b11663a32f1f007bd7cb0b9656825093544 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Mon Jul 21 21:16:58 2014 -0700 Warn if Tor is a relay and a HS Closes 12908; see #8742 --- changes/bug12908 |4 src/or/config.c |7 +++ 2 files

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

2014-08-20 Thread nickm
commit fb762f6db0a363349afd83e5316daf613e27e450 Merge: c57e8da c3f04f3 Author: Nick Mathewson ni...@torproject.org Date: Wed Aug 20 13:34:02 2014 -0400 Merge remote-tracking branch 'public/bug11787' changes/bug11787 |5 + src/common/torgzip.c |2 +- 2 files changed, 6

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

2014-08-20 Thread nickm
commit c57e8da4ea9168bb946040350434088cb7cb Merge: d0009cb a3fe8b1 Author: Nick Mathewson ni...@torproject.org Date: Wed Aug 20 12:58:26 2014 -0400 Merge remote-tracking branch 'public/bug12908_025' changes/bug12908 |4 src/or/config.c |7 +++ 2 files changed, 11

[tor-commits] [tor/master] Synchronize less frequently when compressing descriptors

2014-08-20 Thread nickm
commit 8ecfcf712c4e673687e4904e0a73e5c70b1a7eeb Author: Nick Mathewson ni...@torproject.org Date: Wed May 7 10:27:30 2014 -0400 Synchronize less frequently when compressing descriptors This may improve our compression ratios. fix for 11787 --- src/common/torgzip.c |2

[tor-commits] [tor/master] Changes file for bug 11787

2014-08-20 Thread nickm
commit c3f04f3daa27ce61da10e9bcf12cf05b376f73ed Author: Nick Mathewson ni...@torproject.org Date: Wed Aug 20 13:33:49 2014 -0400 Changes file for bug 11787 --- changes/bug11787 |5 + 1 file changed, 5 insertions(+) diff --git a/changes/bug11787 b/changes/bug11787 new file mode

[tor-commits] [tor/master] Fix return value of tor_fd_seekend.

2014-08-20 Thread nickm
commit 7c61d10c6c09b32a4b8acd2553aa05c4fbc06611 Author: Nick Mathewson ni...@torproject.org Date: Wed Aug 20 13:48:17 2014 -0400 Fix return value of tor_fd_seekend. Previously, we had documented it to return -1 or 0, when in fact lseek returns -1 or the new position in the

[tor-commits] [tor/master] Allow named pipes for our log files.

2014-08-20 Thread nickm
commit a32913d5aa816cdc41edbabf9b606b83aea6c835 Author: Nick Mathewson ni...@torproject.org Date: Wed Aug 20 13:45:16 2014 -0400 Allow named pipes for our log files. Closes ticket 12061. Based on a patch from carlo von lynX on tor-dev at

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

2014-08-20 Thread translation
commit 482d7884e333691b99a63baaf3d8ea31cee74993 Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 18:45:46 2014 + Update translations for torbutton-torbuttonproperties --- pt_BR/torbutton.properties |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

[tor-commits] [tor/master] Hand-fix a few global_circuit_list cases

2014-08-20 Thread nickm
commit 664b2645fbb952208a13d213bc237af868109a00 Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 16:32:32 2014 -0400 Hand-fix a few global_circuit_list cases --- src/or/circuituse.c | 17 +++-- src/or/status.c |8 +--- 2 files changed, 8 insertions(+),

[tor-commits] [tor/master] Don't allocate an extra smartlist in the OOM handler

2014-08-20 Thread nickm
commit 7f5a440421b122c2d594a89e21799078b3d7284a Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 17:37:39 2014 -0400 Don't allocate an extra smartlist in the OOM handler Fixes issue 10116 --- changes/bug10116 |3 +++ src/or/circuitlist.c | 19

[tor-commits] [tor/master] Start converting circuitlist to smartlist.

2014-08-20 Thread nickm
commit db2af2abb03a82e7c71581efa04a45869feba38a Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 15:42:14 2014 -0400 Start converting circuitlist to smartlist. --- src/or/circuitlist.c |9 + src/or/circuitlist.h |4 +--- src/or/or.h |4 ++-- 3 files

[tor-commits] [tor/master] fix remaining compilation problems

2014-08-20 Thread nickm
commit 82d4b60b91483ad2cf12a4feefc1c5020bf605b8 Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 17:02:28 2014 -0400 fix remaining compilation problems --- src/or/circuitlist.c | 48 src/test/test_status.c | 28

[tor-commits] [tor/master] Autoconvert most circuit-list iterations to smartlist iterations

2014-08-20 Thread nickm
commit 6969bd9a02895ae7dc80264fb59adba4a44f79a1 Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 15 16:23:22 2014 -0400 Autoconvert most circuit-list iterations to smartlist iterations Breaks compilation. Used this coccinelle script: @@ identifier c;

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

2014-08-20 Thread nickm
commit 01a0ab02a3d8ef9e7664945224ce5e22f18ac4b9 Merge: 7c61d10 7f5a440 Author: Nick Mathewson ni...@torproject.org Date: Wed Aug 20 14:52:24 2014 -0400 Merge branch 'bug10116_squashed' changes/bug10116 |3 ++ src/or/circpathbias.c |4 +- src/or/circuitlist.c | 104

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

2014-08-20 Thread translation
commit 2edb5074b030b8886cbc6cb531d9850841d19b3d Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 19:15:45 2014 + Update translations for torbutton-torbuttonproperties --- pt_BR/torbutton.properties | 14 +++--- 1 file changed, 7 insertions(+), 7

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

2014-08-20 Thread nickm
commit 2994f00199096860c4cbdfcb6b7d82918d637b27 Author: Nick Mathewson ni...@torproject.org Date: Wed Aug 20 15:32:35 2014 -0400 Whitespace fixes --- src/test/test_entrynodes.c |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/test_entrynodes.c

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

2014-08-20 Thread nickm
commit 916fba2243f36dcf53b078a95ce2389a63b94f72 Merge: 01a0ab0 2994f00 Author: Nick Mathewson ni...@torproject.org Date: Wed Aug 20 15:32:48 2014 -0400 Merge branch 'bug12205_take2_squashed' changes/bug12205 |4 +++ src/or/entrynodes.c| 41 +---

[tor-commits] [tor/master] Unit testing entry_is_time_to_retry().

2014-08-20 Thread nickm
commit 8b539cc27684534a6a71cef92f9a6782040f6ca9 Author: rl1987 rl1...@sdf.lonestar.org Date: Wed Aug 20 22:07:08 2014 +0300 Unit testing entry_is_time_to_retry(). --- src/or/entrynodes.c|2 +- src/or/entrynodes.h|3 ++ src/test/test_entrynodes.c | 79

[tor-commits] [tor/master] Small cleanups to test_entry_is_time_to_retry

2014-08-20 Thread nickm
commit a5fe84b5a6a2adb78ea917ad46a77b1793518cc1 Author: Nick Mathewson ni...@torproject.org Date: Wed Aug 20 15:31:25 2014 -0400 Small cleanups to test_entry_is_time_to_retry --- src/test/test_entrynodes.c |9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git

[tor-commits] [tor/master] Rewriting entry_is_time_to_retry() using table approach.

2014-08-20 Thread nickm
commit 197d8550094d0509bed9e682b4a7b723dd948141 Author: rl1987 rl1...@sdf.lonestar.org Date: Tue Aug 19 22:12:19 2014 +0300 Rewriting entry_is_time_to_retry() using table approach. --- changes/bug12205|4 src/or/entrynodes.c | 37 +++-- 2

[tor-commits] [tor/master] Write comments for members of periods array.

2014-08-20 Thread nickm
commit c731a1c68f47812f0bc536a8fab548c3c734ce28 Author: rl1987 rl1...@sdf.lonestar.org Date: Tue Aug 19 22:23:11 2014 +0300 Write comments for members of periods array. --- src/or/entrynodes.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git

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

2014-08-20 Thread translation
commit 86e723b9a0cd889467620689c7f5f9986323 Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 20:15:03 2014 + Update translations for bridgedb --- sl/LC_MESSAGES/bridgedb.po |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git

[tor-commits] [translation/tor-and-https] Update translations for tor-and-https

2014-08-20 Thread translation
commit e632a9b6576c776beebd9ecaca35be57c4d47d2f Author: Translation commit bot translat...@torproject.org Date: Wed Aug 20 20:15:54 2014 + Update translations for tor-and-https --- sl.po | 43 ++- 1 file changed, 22 insertions(+), 21

[tor-commits] [obfs4/master] Elide the error out from most logs unless unsafeLogging is set.

2014-08-20 Thread yawning
commit 596cc8507340a1233defe5bf88e6e2a400cc7f9f Author: Yawning Angel yawn...@torproject.org Date: Wed Aug 20 22:44:07 2014 + Elide the error out from most logs unless unsafeLogging is set. The Golang runtime will happily splatter the remote IP address and port in the

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

2014-08-20 Thread translation
commit 96132a6e4319695b9ca0ccf54c39d60fd2bb94dc Author: Translation commit bot translat...@torproject.org Date: Thu Aug 21 00:15:44 2014 + Update translations for torbutton-torbuttonproperties --- nb/torbutton.properties |8 1 file changed, 4 insertions(+), 4 deletions(-)

[tor-commits] [bridgedb/develop] Add a test for Buckets

2014-08-20 Thread isis
commit 12311fff64dba06b24c66dd0523e52f3cd8927b9 Author: Matthew Finkel matthew.fin...@gmail.com Date: Sun Aug 3 18:18:22 2014 + Add a test for Buckets The others will require mocking a DB connection. --- lib/bridgedb/test/test_Bucket.py | 59

[tor-commits] [bridgedb/develop] Fix test_https tests to handle multiple bridge lines.

2014-08-20 Thread isis
commit 9111886f2785da3995b2e1f78737326aedbcb4a7 Author: Isis Lovecruft i...@torproject.org Date: Wed Aug 20 04:30:09 2014 + Fix test_https tests to handle multiple bridge lines. See https://travis-ci.org/isislovecruft/bridgedb/jobs/33035309#L1781 for an example of how this

[tor-commits] [bridgedb/develop] Fix missing `twisted.trial.unittest` import in test_Bucket.py.

2014-08-20 Thread isis
commit fc7582b27bba41f81e1b781422de8d36975aa88b Author: Isis Lovecruft i...@torproject.org Date: Wed Aug 20 05:08:07 2014 + Fix missing `twisted.trial.unittest` import in test_Bucket.py. --- lib/bridgedb/test/test_Bucket.py |2 ++ 1 file changed, 2 insertions(+) diff --git

[tor-commits] [bridgedb/develop] Fix missing `io.StringIO` import in test_Bucket.py.

2014-08-20 Thread isis
commit db63270c23a45411b20c172103f604e2a3242c2c Author: Isis Lovecruft i...@torproject.org Date: Wed Aug 20 05:17:55 2014 + Fix missing `io.StringIO` import in test_Bucket.py. --- lib/bridgedb/test/test_Bucket.py |2 ++ 1 file changed, 2 insertions(+) diff --git

[tor-commits] [bridgedb/develop] Merge remote-tracking branch 'tpo-sysrqb/bug12781-dumpbuckets' into develop

2014-08-20 Thread isis
commit d67770d8cfe717bfdc0540311178a3fb6e1b7ced Merge: 0156214 12311ff Author: Isis Lovecruft i...@torproject.org Date: Wed Aug 20 04:15:12 2014 + Merge remote-tracking branch 'tpo-sysrqb/bug12781-dumpbuckets' into develop lib/bridgedb/Bucket.py | 47

[tor-commits] [bridgedb/develop] Fix typo in inline code comment in bridgedb.Bucket module.

2014-08-20 Thread isis
commit 0181ced5c082b81e1675192da39ff221bcfa757f Author: Isis Lovecruft i...@torproject.org Date: Wed Aug 20 05:29:27 2014 + Fix typo in inline code comment in bridgedb.Bucket module. --- lib/bridgedb/Bucket.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [bridgedb/develop] Fix test_Bucket.BucketDataTests to test `needed` attribute.

2014-08-20 Thread isis
commit dadd800384358356542ccc49bbdad1ae54006cfc Author: Isis Lovecruft i...@torproject.org Date: Wed Aug 20 05:35:01 2014 + Fix test_Bucket.BucketDataTests to test `needed` attribute. --- lib/bridgedb/test/test_Bucket.py | 12 ++-- 1 file changed, 6 insertions(+), 6

[tor-commits] [bridgedb/develop] Fix old-style classes in bridgedb.Bucket.

2014-08-20 Thread isis
commit eecabb0e5054ad619fa8591bfc067cc38ed04cc5 Author: Isis Lovecruft i...@torproject.org Date: Wed Aug 20 05:43:12 2014 + Fix old-style classes in bridgedb.Bucket. --- lib/bridgedb/Bucket.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

[tor-commits] [bridgedb/develop] Dump bridges to file, despite lack of BridgeHistory

2014-08-20 Thread isis
commit f5fe05ce61d0e18bf00638e2eb1fdda785fe4c81 Author: Matthew Finkel matthew.fin...@gmail.com Date: Sun Aug 3 17:40:53 2014 + Dump bridges to file, despite lack of BridgeHistory We only dumped the bridges assigned to buckets if we had bridgehistory for them. This is not

[tor-commits] [bridgedb/develop] Sphinxify all docstrings in bridgedb.Bucket.

2014-08-20 Thread isis
commit aa67615395a4a3d29e855a6e510ddc1a276dbed7 Author: Isis Lovecruft i...@torproject.org Date: Wed Aug 20 05:54:43 2014 + Sphinxify all docstrings in bridgedb.Bucket. --- lib/bridgedb/Bucket.py | 134 +--- 1 file changed, 69 insertions(+),

[tor-commits] [bridgedb/develop] Line wasn't indented in f5fe05ce

2014-08-20 Thread isis
commit deada7243f5f03289cda044c187e535f505dc9a5 Author: Matthew Finkel matthew.fin...@gmail.com Date: Wed Aug 20 06:27:41 2014 + Line wasn't indented in f5fe05ce --- lib/bridgedb/Bucket.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Bucket.py

[tor-commits] [bridgedb/develop] Merge remote-tracking branch 'tpo-sysrqb/bug12781-dumpbuckets_constification_2' into develop

2014-08-20 Thread isis
commit cfd71bee10489d216ed67bdc02cdb4f68e1230e0 Merge: 2f0ea18 deada72 Author: Isis Lovecruft i...@torproject.org Date: Wed Aug 20 06:59:46 2014 + Merge remote-tracking branch 'tpo-sysrqb/bug12781-dumpbuckets_constification_2' into develop Conflicts:

[tor-commits] [bridgedb/develop] Fix yet another type error in test_Bucket.py.

2014-08-20 Thread isis
commit 7c6f68326a920ca6ee9f3089acc493690af303a2 Author: Isis Lovecruft i...@torproject.org Date: Wed Aug 20 07:23:01 2014 + Fix yet another type error in test_Bucket.py. --- lib/bridgedb/test/test_Bucket.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [bridgedb/develop] Disable COLLECT_TIMESTAMPS for CI integration test runs.

2014-08-20 Thread isis
commit 41d6236f3138cb73723ccfc9d1b7aea5856b5255 Author: Isis Lovecruft i...@torproject.org Date: Wed Aug 20 22:06:21 2014 + Disable COLLECT_TIMESTAMPS for CI integration test runs. --- bridgedb.conf |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb.conf

[tor-commits] [bridgedb/develop] Constify the unrealistic maximum number of bridges per bucket

2014-08-20 Thread isis
commit b778f85304ace66d1b5dbdcacc781420a71d8201 Author: Matthew Finkel matthew.fin...@gmail.com Date: Wed Aug 20 05:51:08 2014 + Constify the unrealistic maximum number of bridges per bucket We will never, ever have 1 million bridges, but because of this we will also never

[tor-commits] [bridgedb/develop] Add missing unittest import

2014-08-20 Thread isis
commit 0ea71dd97c292063247c25943ed0c4bc11bc93ac Author: Matthew Finkel matthew.fin...@gmail.com Date: Wed Aug 20 06:15:55 2014 + Add missing unittest import --- lib/bridgedb/test/test_Bucket.py |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git

[tor-commits] [bridgedb/develop] Be more careful about how we split bridge lines in test_https.py.

2014-08-20 Thread isis
commit bd590d73dea233d82364745ae282f386ed670c6e Author: Isis Lovecruft i...@torproject.org Date: Wed Aug 20 07:45:54 2014 + Be more careful about how we split bridge lines in test_https.py. This is done to ensure that if we don't get the bridges.html page in response (i.e.

[tor-commits] [bridgedb/develop] Increase sleep time in test_bridgedb.py tests for non-CI machines.

2014-08-20 Thread isis
commit d131f15a98573dd37619b6bb7895e09589e223b8 Author: Isis Lovecruft i...@torproject.org Date: Wed Aug 20 21:20:37 2014 + Increase sleep time in test_bridgedb.py tests for non-CI machines. --- lib/bridgedb/test/test_bridgedb.py | 17 +++-- 1 file changed, 15

[tor-commits] [bridgedb/develop] Fix another typo in test_Bucket.py.

2014-08-20 Thread isis
commit 2f0ea18d2379fc8b67071adc37d9412c8eb77ced Author: Isis Lovecruft i...@torproject.org Date: Wed Aug 20 05:56:35 2014 + Fix another typo in test_Bucket.py. --- lib/bridgedb/test/test_Bucket.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

[tor-commits] [bridgedb/develop] PEP8 fix bad indentation in test_https.py.

2014-08-20 Thread isis
commit 2e28fc225ed83d9e776a8bea81d10738d532ce65 Author: Isis Lovecruft i...@torproject.org Date: Thu Aug 21 02:39:02 2014 + PEP8 fix bad indentation in test_https.py. --- lib/bridgedb/test/test_https.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

[tor-commits] [bridgedb/develop] Sphinxify a docstring in test_https.py.

2014-08-20 Thread isis
commit f1d97e94993de6e4170780b4761b0a674fa835c0 Author: Isis Lovecruft i...@torproject.org Date: Thu Aug 21 02:34:44 2014 + Sphinxify a docstring in test_https.py. --- lib/bridgedb/test/test_https.py |9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git

[tor-commits] [bridgedb/develop] PEP8 fix several line-too-long problems in test_https.py.

2014-08-20 Thread isis
commit ee8b578e1bbdf7f00dc6342d433b26fd46c7ed7d Author: Isis Lovecruft i...@torproject.org Date: Thu Aug 21 02:38:29 2014 + PEP8 fix several line-too-long problems in test_https.py. --- lib/bridgedb/test/test_https.py | 32 ++-- 1 file changed, 18

[tor-commits] [bridgedb/develop] Remove print() calls from test_https.py.

2014-08-20 Thread isis
commit 68bfbcdc899b5c5fbfd9e97e4b36a5a7402939f9 Author: Isis Lovecruft i...@torproject.org Date: Thu Aug 21 02:34:07 2014 + Remove print() calls from test_https.py. --- lib/bridgedb/test/test_https.py | 10 -- 1 file changed, 10 deletions(-) diff --git

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

2014-08-20 Thread isis
commit 1e7e8324ddb113920348990172e194440f322f55 Author: Isis Lovecruft i...@torproject.org Date: Thu Aug 21 02:42:14 2014 + Add unittests for bridgedb.bridgerequest. --- lib/bridgedb/test/test_bridgerequest.py | 44 +++ 1 file changed, 44 insertions(+)