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

2014-09-20 Thread translation
commit e823b2c150c4604e00b380160f9af54097515b39 Author: Translation commit bot translat...@torproject.org Date: Sat Sep 20 08:45:10 2014 + Update translations for bridgedb_completed --- sv/LC_MESSAGES/bridgedb.po | 18 +- 1 file changed, 9 insertions(+), 9

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

2014-09-20 Thread translation
commit 859d61f4da79f501cb13f1dbcf6c7bdaa8b75ed7 Author: Translation commit bot translat...@torproject.org Date: Sat Sep 20 08:45:03 2014 + Update translations for bridgedb --- sv/LC_MESSAGES/bridgedb.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

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

2014-09-20 Thread translation
commit 86b961ce759aded28c80ce73779a3ff30d8f2e70 Author: Translation commit bot translat...@torproject.org Date: Sat Sep 20 08:45:47 2014 + Update translations for tor-launcher-network-settings --- sv/network-settings.dtd | 10 +- 1 file changed, 5 insertions(+), 5

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

2014-09-20 Thread translation
commit 96bf2fe85bbacb1e695ed3fe8ad677cb4d66e8d3 Author: Translation commit bot translat...@torproject.org Date: Sat Sep 20 08:46:06 2014 + Update translations for torbutton-torbuttonproperties --- sv/torbutton.properties |8 1 file changed, 4 insertions(+), 4 deletions(-)

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

2014-09-20 Thread translation
commit ff11cc0260a7e2396c097cc81cd94f718662d051 Author: Translation commit bot translat...@torproject.org Date: Sat Sep 20 08:45:51 2014 + Update translations for tor-launcher-network-settings_completed --- sv/network-settings.dtd | 12 +--- 1 file changed, 5 insertions(+), 7

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

2014-09-20 Thread translation
commit 419bda93d35e9aefb049a2e9b200d9129e3f22fd Author: Translation commit bot translat...@torproject.org Date: Sat Sep 20 08:45:37 2014 + Update translations for tor-launcher-properties --- sv/torlauncher.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2014-09-20 Thread translation
commit 1939e09dbee4d6c2326c337a3d1f05248c068596 Author: Translation commit bot translat...@torproject.org Date: Sat Sep 20 09:15:21 2014 + Update translations for https_everywhere --- de/https-everywhere.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2014-09-20 Thread translation
commit 2da3b42240a6483fd2693711dd178aa9dca0fb68 Author: Translation commit bot translat...@torproject.org Date: Sat Sep 20 09:15:03 2014 + Update translations for bridgedb --- sv/LC_MESSAGES/bridgedb.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2014-09-20 Thread translation
commit 9bfade28e1ce12c0709fe43d2ae84dba8496670d Author: Translation commit bot translat...@torproject.org Date: Sat Sep 20 09:15:15 2014 + Update translations for torcheck_completed --- de/torcheck.po |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git

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

2014-09-20 Thread translation
commit 70e5df2375666c8230e5a288e3b87607d6ea63a4 Author: Translation commit bot translat...@torproject.org Date: Sat Sep 20 09:15:06 2014 + Update translations for bridgedb_completed --- sv/LC_MESSAGES/bridgedb.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2014-09-20 Thread translation
commit 5248426143f1b3bb9625892b8df379a1f7f9d1bc Author: Translation commit bot translat...@torproject.org Date: Sat Sep 20 09:15:12 2014 + Update translations for torcheck --- de/torcheck.po |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de/torcheck.po

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

2014-09-20 Thread translation
commit 6c9a947ab205d1f44aa62f2e70be73f0086c7c4b Author: Translation commit bot translat...@torproject.org Date: Sat Sep 20 09:15:25 2014 + Update translations for https_everywhere_completed --- de/https-everywhere.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2014-09-20 Thread translation
commit cc301e1677da093bc3c10f6722ce7e7a8903e44c Author: Translation commit bot translat...@torproject.org Date: Sat Sep 20 14:15:03 2014 + Update translations for bridgedb --- eu/LC_MESSAGES/bridgedb.po | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff

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

2014-09-20 Thread translation
commit 8f72e2836f18f64afaafd8637773bf5accc98d4c Author: Translation commit bot translat...@torproject.org Date: Sat Sep 20 14:15:21 2014 + Update translations for tails-persistence-setup --- eu/eu.po | 45 +++-- 1 file changed, 23

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

2014-09-20 Thread translation
commit e410ddfd684829007c51aa66c8c952407d6f5fe6 Author: Translation commit bot translat...@torproject.org Date: Sat Sep 20 14:15:24 2014 + Update translations for tails-persistence-setup_completed --- eu/eu.po | 61 +++-- 1 file

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

2014-09-20 Thread translation
commit 8e5249ac8d84a0a1fc2bd61d2a6cc68fc14d6f3d Author: Translation commit bot translat...@torproject.org Date: Sat Sep 20 14:15:55 2014 + Update translations for tor-and-https --- eu.po | 59 ++- 1 file changed, 30

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

2014-09-20 Thread translation
commit 778d8d1fbe6c204a3d3cfa87ce76d73f6227728f Author: Translation commit bot translat...@torproject.org Date: Sat Sep 20 16:45:34 2014 + Update translations for tails-misc --- eu.po | 29 +++-- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git

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

2014-09-20 Thread translation
commit 09719e6d7248af28e869f3d2d74bff10668fa3ad Author: Translation commit bot translat...@torproject.org Date: Sat Sep 20 16:45:51 2014 + Update translations for tor-and-https --- eu.po |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eu.po b/eu.po index

[tor-commits] [meek/master] A php reflector for meek

2014-09-20 Thread arlo
commit f5726d12dca8135144433c93a16500b05d742f88 Author: Arlo Breault arlo...@gmail.com Date: Fri Sep 19 23:39:37 2014 -0700 A php reflector for meek --- README|5 + php/README| 13 + php/index.php | 38 ++ 3 files

[tor-commits] [tor/maint-0.2.3] gabelmoo's IPv4 address changed

2014-09-20 Thread arma
commit 0eec8e2aa51f779e458fb3831b0ed8ae1db896ec Author: Sebastian Hahn sebast...@torproject.org Date: Fri Sep 19 13:40:37 2014 +0200 gabelmoo's IPv4 address changed --- changes/bug13100 |3 +++ src/or/config.c |2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git

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

2014-09-20 Thread arma
commit 288b3ec6035aad694942960f3b71693907f7e584 Merge: 0c3b365 0eec8e2 Author: Roger Dingledine a...@torproject.org Date: Sat Sep 20 16:49:24 2014 -0400 Merge branch 'maint-0.2.3' into maint-0.2.4 changes/bug13100 |3 +++ src/or/config.c |2 +- 2 files changed, 4 insertions(+), 1

[tor-commits] [tor/maint-0.2.4] gabelmoo's IPv4 address changed

2014-09-20 Thread arma
commit 0eec8e2aa51f779e458fb3831b0ed8ae1db896ec Author: Sebastian Hahn sebast...@torproject.org Date: Fri Sep 19 13:40:37 2014 +0200 gabelmoo's IPv4 address changed --- changes/bug13100 |3 +++ src/or/config.c |2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git

[tor-commits] [tor/maint-0.2.5] gabelmoo's IPv4 address changed

2014-09-20 Thread arma
commit 0eec8e2aa51f779e458fb3831b0ed8ae1db896ec Author: Sebastian Hahn sebast...@torproject.org Date: Fri Sep 19 13:40:37 2014 +0200 gabelmoo's IPv4 address changed --- changes/bug13100 |3 +++ src/or/config.c |2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git

[tor-commits] [tor/maint-0.2.5] Merge branch 'maint-0.2.3' into maint-0.2.4

2014-09-20 Thread arma
commit 288b3ec6035aad694942960f3b71693907f7e584 Merge: 0c3b365 0eec8e2 Author: Roger Dingledine a...@torproject.org Date: Sat Sep 20 16:49:24 2014 -0400 Merge branch 'maint-0.2.3' into maint-0.2.4 changes/bug13100 |3 +++ src/or/config.c |2 +- 2 files changed, 4 insertions(+), 1

[tor-commits] [tor/maint-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5

2014-09-20 Thread arma
commit 87576e826f5f60d13478bb9de642be0e6f5533a1 Merge: be0e262 288b3ec Author: Roger Dingledine a...@torproject.org Date: Sat Sep 20 16:50:32 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 Conflicts: src/or/config.c changes/bug13100 |3 +++ src/or/config.c |

[tor-commits] [tor/master] gabelmoo's IPv4 address changed

2014-09-20 Thread arma
commit 0eec8e2aa51f779e458fb3831b0ed8ae1db896ec Author: Sebastian Hahn sebast...@torproject.org Date: Fri Sep 19 13:40:37 2014 +0200 gabelmoo's IPv4 address changed --- changes/bug13100 |3 +++ src/or/config.c |2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git

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

2014-09-20 Thread arma
commit 288b3ec6035aad694942960f3b71693907f7e584 Merge: 0c3b365 0eec8e2 Author: Roger Dingledine a...@torproject.org Date: Sat Sep 20 16:49:24 2014 -0400 Merge branch 'maint-0.2.3' into maint-0.2.4 changes/bug13100 |3 +++ src/or/config.c |2 +- 2 files changed, 4 insertions(+), 1

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.3' into maint-0.2.4

2014-09-20 Thread arma
commit 288b3ec6035aad694942960f3b71693907f7e584 Merge: 0c3b365 0eec8e2 Author: Roger Dingledine a...@torproject.org Date: Sat Sep 20 16:49:24 2014 -0400 Merge branch 'maint-0.2.3' into maint-0.2.4 changes/bug13100 |3 +++ src/or/config.c |2 +- 2 files changed, 4 insertions(+), 1

[tor-commits] [tor/release-0.2.5] gabelmoo's IPv4 address changed

2014-09-20 Thread arma
commit 0eec8e2aa51f779e458fb3831b0ed8ae1db896ec Author: Sebastian Hahn sebast...@torproject.org Date: Fri Sep 19 13:40:37 2014 +0200 gabelmoo's IPv4 address changed --- changes/bug13100 |3 +++ src/or/config.c |2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git

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

2014-09-20 Thread arma
commit e170205cd8aae085687ca3b166bcc38b2134fc22 Merge: 6d6e21a 87576e8 Author: Roger Dingledine a...@torproject.org Date: Sat Sep 20 16:51:17 2014 -0400 Merge branch 'maint-0.2.5' changes/bug13100 |3 +++ src/or/config.c |2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.4' into maint-0.2.5

2014-09-20 Thread arma
commit 87576e826f5f60d13478bb9de642be0e6f5533a1 Merge: be0e262 288b3ec Author: Roger Dingledine a...@torproject.org Date: Sat Sep 20 16:50:32 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 Conflicts: src/or/config.c changes/bug13100 |3 +++ src/or/config.c |

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

2014-09-20 Thread arma
commit 70762a0e9c396bdba01b8cc1cdc6d1c275f9aa1d Merge: 22a8216 87576e8 Author: Roger Dingledine a...@torproject.org Date: Sat Sep 20 16:51:41 2014 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/bug13100 |3 +++ src/or/config.c |2 +- 2 files changed, 4 insertions(+),

[tor-commits] [tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5

2014-09-20 Thread arma
commit 87576e826f5f60d13478bb9de642be0e6f5533a1 Merge: be0e262 288b3ec Author: Roger Dingledine a...@torproject.org Date: Sat Sep 20 16:50:32 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 Conflicts: src/or/config.c changes/bug13100 |3 +++ src/or/config.c |

[tor-commits] [tor/release-0.2.5] merge in the next changes entry

2014-09-20 Thread arma
commit 9fe73959847ab5caa6b723fb5567882604a31765 Author: Roger Dingledine a...@torproject.org Date: Sat Sep 20 17:11:43 2014 -0400 merge in the next changes entry --- ChangeLog|8 changes/bug13100 |3 --- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git

[tor-commits] [bridgedb/develop] Add obfs4 bridge line unittests and regression tests for #12932.

2014-09-20 Thread isis
commit 6f29393d48612f1a5fee97d889971fefa671b877 Author: Isis Lovecruft i...@torproject.org Date: Sat Sep 6 02:59:24 2014 + Add obfs4 bridge line unittests and regression tests for #12932. --- lib/bridgedb/test/test_https.py | 133 +++ 1 file

[tor-commits] [bridgedb/develop] Bump Leekspin to 1.1.3; it now supports obfs4 mocking.

2014-09-20 Thread isis
commit 40818e8b1e2e61516ab451306dc6ec489c01f33e Author: Isis Lovecruft i...@torproject.org Date: Fri Sep 5 07:15:21 2014 + Bump Leekspin to 1.1.3; it now supports obfs4 mocking. --- .test.requirements.txt |2 +- .travis.requirements.txt |2 +- setup.py |2

[tor-commits] [bridgedb/develop] Fix an additional four bugs in bridgdb.Bridges.parseExtraInfoFile().

2014-09-20 Thread isis
commit 514026ceb102a359011016f842cd63fd5e6dd1ea Author: Isis Lovecruft i...@torproject.org Date: Sat Sep 6 03:00:41 2014 + Fix an additional four bugs in bridgdb.Bridges.parseExtraInfoFile(). In addition to the one-character bug for #12932 which was fixed in commit

[tor-commits] [bridgedb/develop] Add obfs4 to the HTTPS Distributor's PT options dropdown.

2014-09-20 Thread isis
commit 1e2db4e7b4ede66443b3d2dfb6e695a9085119c7 Author: Isis Lovecruft i...@torproject.org Date: Sat Sep 6 02:55:36 2014 + Add obfs4 to the HTTPS Distributor's PT options dropdown. This is temporary. It is needed in order to make sure that the regression tests for #12932

[tor-commits] [bridgedb/develop] Disable obfs4 distribution (for now).

2014-09-20 Thread isis
commit 519426c5c545fe96577b38fa6fba29f98286b7cb Author: Isis Lovecruft i...@torproject.org Date: Sat Sep 6 03:07:34 2014 + Disable obfs4 distribution (for now). Until we have enough bridges supporting obfs4 to actually distribute them, and Tor Browser has obfs4 built in,

[tor-commits] [bridgedb/develop] Change bridge line PT args to be space-separated.

2014-09-20 Thread isis
commit 487c1b6c16e979bc448ddd415364e28bd764d29a Author: Isis Lovecruft i...@torproject.org Date: Fri Sep 5 00:54:33 2014 + Change bridge line PT args to be space-separated. * FIXES #12932 https://bugs.torproject.org/12932 --- lib/bridgedb/Bridges.py |2 +- 1 file changed,

[tor-commits] [bridgedb/develop] Merge branch 'fix/12932-pt-args-spaces' into develop

2014-09-20 Thread isis
commit 6bc04ac2f9d05080c960d4de04b566e43146425e Merge: fe3967b 519426c Author: Isis Lovecruft i...@torproject.org Date: Sat Sep 6 03:37:48 2014 + Merge branch 'fix/12932-pt-args-spaces' into develop .test.requirements.txt |2 +- .travis.requirements.txt|

[tor-commits] [arm/master] Taking advantage of str_tools.join()

2014-09-20 Thread atagar
commit 2045a1bcdd98a9e9d793b582d2cb5f1b6c905426 Author: Damian Johnson ata...@torproject.org Date: Wed Sep 17 10:17:48 2014 -0700 Taking advantage of str_tools.join() Couple bits we can nicely simplify with stem's new join() method. --- arm/graphing/bandwidth_stats.py | 33

[tor-commits] [stem/master] Adding get_effective_rate() to the Controller

2014-09-20 Thread atagar
commit 8ae878d48268ff38d232cc7c8e6ff40f8ec6324b Author: Damian Johnson ata...@torproject.org Date: Sat Sep 20 13:12:51 2014 -0700 Adding get_effective_rate() to the Controller Method to provide the bytes per second we're configured to relay at. Tor has this be the minimum of a

[tor-commits] [arm/master] Better handle bandwidth averages

2014-09-20 Thread atagar
commit d9e5362891bd70c40ef318739d7be38a4277d478 Author: Damian Johnson ata...@torproject.org Date: Thu Sep 18 10:08:04 2014 -0700 Better handle bandwidth averages Arm was made in a time before 'GETINFO traffic/*'. In fact, I added those options just for arm. :) We had

[tor-commits] [arm/master] Taking advantage of get_effective_rate()

2014-09-20 Thread atagar
commit 8d5bb39570db5e2c15d75e83b6ea432384f0ba9e Author: Damian Johnson ata...@torproject.org Date: Sat Sep 20 13:15:01 2014 -0700 Taking advantage of get_effective_rate() Droping our helper function that got this. --- arm/graphing/bandwidth_stats.py | 42

[tor-commits] [arm/master] Revising title stat handling

2014-09-20 Thread atagar
commit d25eeb1a163ab7c0c4d69f211fa01056de70e6b7 Author: Damian Johnson ata...@torproject.org Date: Sat Sep 20 18:45:20 2014 -0700 Revising title stat handling Not only tidying up the code a bit but addressing several issues (stacktrace due to accessing a NewDesc event attribute