date:20140920

[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 deletions(-)

diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 62c7622..9dc38af 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -12,8 +12,8 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
-POT-Creation-Date: 2014-06-06 21:46+\n
-PO-Revision-Date: 2014-06-17 09:50+\n
+POT-Creation-Date: 2014-07-26 02:11+\n
+PO-Revision-Date: 2014-09-20 08:15+\n
 Last-Translator: phst transi...@sturman.se\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n
@@ -77,7 +77,7 @@ msgstr Hej, %s!
 msgid Hello, friend!
 msgstr Hej, kompis!
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid Public Keys
 msgstr Publika nycklar
 
@@ -145,8 +145,8 @@ msgstr Jag behÃ¶ver ett alternativt sÃ¤tt att skaffa 
bryggor pÃ¥!
 msgid 
 Another way to get bridges is to send an email to %s. Please note that you 
must\n
 send the email using an address from one of the following email providers:\n
-%s or %s.
-msgstr Ett annat sÃ¤tt att fÃ¥ nya bryggor Ã¤r att skicka e-post till %s. Du 
mÃ¥ste skicka mailet\nfrÃ¥n en adress hos nÃ¥gon av fÃ¶ljande 
epostleverantÃ¶rer:\n%s eller %s.
+%s, %s or %s.
+msgstr Ett annat sÃ¤tt att fÃ¥ nya broar Ã¤r att skicka e-post till %s. Du 
mÃ¥ste skicka mailet\nfrÃ¥n en adress hos nÃ¥gon av fÃ¶ljande 
e-postleverantÃ¶rer:\n%s, %s eller %s.
 
 #: lib/bridgedb/strings.py:90
 msgid My bridges don't work! I need help!
@@ -258,19 +258,19 @@ msgstr Leta efter en Pluggable Transport av en viss TYPE
 msgid Get a copy of BridgeDB's public GnuPG key.
 msgstr HÃ¤mta en kopia av BridgeDB:s publika GnuPG-nyckel.
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
 msgid Report a Bug
 msgstr Rapportera en bugg
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
 msgid Source Code
 msgstr KÃ¤llkod
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
 msgid Changelog
 msgstr Ãndringslogg
 
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
 msgid Contact
 msgstr Kontakt
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index e2e3a0f..9dc38af 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -13,8 +13,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
 POT-Creation-Date: 2014-07-26 02:11+\n
-PO-Revision-Date: 2014-07-26 09:42+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2014-09-20 08:15+\n
+Last-Translator: phst transi...@sturman.se\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -146,7 +146,7 @@ msgid 
 Another way to get bridges is to send an email to %s. Please note that you 
must\n
 send the email using an address from one of the following email providers:\n
 %s, %s or %s.
-msgstr 
+msgstr Ett annat sÃ¤tt att fÃ¥ nya broar Ã¤r att skicka e-post till %s. Du 
mÃ¥ste skicka mailet\nfrÃ¥n en adress hos nÃ¥gon av fÃ¶ljande 
e-postleverantÃ¶rer:\n%s, %s eller %s.
 
 #: lib/bridgedb/strings.py:90
 msgid My bridges don't work! I need help!

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 deletions(-)

diff --git a/sv/network-settings.dtd b/sv/network-settings.dtd
index 3f71c94..f80c728 100644
--- a/sv/network-settings.dtd
+++ b/sv/network-settings.dtd
@@ -8,8 +8,8 @@
 !ENTITY torSettings.no Nej
 
 !ENTITY torSettings.firstQuestion Vilket av fÃ¶ljande beskriver bÃ¤st din 
situation?
-!ENTITY torSettings.configurePrompt1 This computer's Internet connection is 
censored or proxied.
-!ENTITY torSettings.configurePrompt2 I need to configure bridge or proxy 
settings.
+!ENTITY torSettings.configurePrompt1 Den hÃ¤r datorns Internetanslutning Ã¤r 
censorerad eller gÃ¥r genom en proxy.
+!ENTITY torSettings.configurePrompt2 Jag behÃ¶ver konfigurera brygg- eller 
proxyinstÃ¤llningar.
 !ENTITY torSettings.configure Konfigurera
 !ENTITY torSettings.connectPrompt2 Jag vill ansluta direkt till 
Tor-nÃ¤tverket.
 !ENTITY torSettings.connectPrompt3 Detta fungerar i de flesta situationer.
@@ -26,7 +26,7 @@
 !-- Other: --
 
 !ENTITY torsettings.startingTor VÃ¤ntar pÃ¥ att Tor ska starta...
-!ENTITY torsettings.restartTor Restart Tor
+!ENTITY torsettings.restartTor Starta om Tor
 
 !ENTITY torsettings.optional Valfri
 
@@ -56,7 +56,7 @@
 !ENTITY torsettings.bridgeHelp2Heading Via nÃ¤tet
 !ENTITY torsettings.bridgeHelp2 AnvÃ¤nd en webblÃ¤sare fÃ¶r att besÃ¶ka 
https://bridges.torproject.org;
 !ENTITY torsettings.bridgeHelp3Heading Via e-post autosvar
-!ENTITY torsettings.bridgeHelp3.emailDesc Send email to 
brid...@torproject.org with the line 'get bridges' by itself in the body of the 
message.#160; However, to make it harder for an attacker to learn a lot of 
bridge addresses, you must send this request from one of the following email 
providers (listed in order of preference):
-!ENTITY torsettings.bridgeHelp3.emailList https://www.riseup.net, 
https://mail.google.com, or https://mail.yahoo.com;
+!ENTITY torsettings.bridgeHelp3.emailDesc Skicka ett e-postmeddelande till 
brid...@torproject.org med bara quot;get bridgesquot; i texten.#160; Men 
fÃ¶r att gÃ¶ra det svÃ¥rare fÃ¶r en angripare att fÃ¥ tag pÃ¥ mÃ¥nga adresser 
till bryggor sÃ¥ mÃ¥ste du skicka meddelandet frÃ¥n nÃ¥gon av fÃ¶ljande 
epostleverantÃ¶rer (listan Ã¤r sorterad pÃ¥ vilka vi fÃ¶redrar):
+!ENTITY torsettings.bridgeHelp3.emailList https://www.riseup.net, 
https://mail.google.com, eller https://mail.yahoo.com;
 !ENTITY torsettings.bridgeHelp4Heading Via supporten
 !ENTITY torsettings.bridgeHelp4 Som en sista utvÃ¤g kan du skicka ett artigt 
e-post meddelande pÃ¥ engelska till h...@rt.torproject.org, och frÃ¥ga efter 
bryggadresser.#160; TÃ¤nk pÃ¥ att en person mÃ¥ste svara pÃ¥ varje sÃ¥dan 
fÃ¶rfrÃ¥gan.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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(-)

diff --git a/sv/torbutton.properties b/sv/torbutton.properties
index aab3f2f..d1cc52a 100644
--- a/sv/torbutton.properties
+++ b/sv/torbutton.properties
@@ -48,10 +48,10 @@ torbutton.popup.confirm_plugins = Insticksmoduler sÃ¥ som 
Flash kan Ã¤ventyra di
 torbutton.popup.never_ask_again = FrÃ¥ga aldrig igen
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image 
data, which may be used to uniquely identify your computer.\n\nShould Tor 
Browser allow this website to extract HTML5 canvas image data?
-canvas.notNow=Not Now
+canvas.siteprompt=Denna webbsida (%S) fÃ¶rsÃ¶kte komma Ã¥t HTML5-bilddata pÃ¥ 
ett kanvas, som skulle kunna anvÃ¤ndas fÃ¶r att identifiera just din 
dator.\n\nSka Tor Browser tillÃ¥ta den hÃ¤r webbsidan att anvÃ¤nda 
HTML5-bilddata pÃ¥ kanvas?
+canvas.notNow=Inte just nu
 canvas.notNowAccessKey=N
-canvas.allow=Allow in the future
+canvas.allow=Ja, tillÃ¥t alltid
 canvas.allowAccessKey=A
-canvas.never=Never for this site (recommended)
+canvas.never=Aldrig fÃ¶r denna sida (rekommenderas)
 canvas.neverAccessKey=e

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 deletions(-)

diff --git a/sv/network-settings.dtd b/sv/network-settings.dtd
index b19b788..f80c728 100644
--- a/sv/network-settings.dtd
+++ b/sv/network-settings.dtd
@@ -8,8 +8,8 @@
 !ENTITY torSettings.no Nej
 
 !ENTITY torSettings.firstQuestion Vilket av fÃ¶ljande beskriver bÃ¤st din 
situation?
-!ENTITY torSettings.configurePrompt1 Denna dators internetanslutning Ã¤r 
censurerad, filtrerad, eller bakom en proxy.
-!ENTITY torSettings.configurePrompt2 Jag behÃ¶ver konfigurera brygg-, 
brandvÃ¤gg- eller proxyinstÃ¤llningar.
+!ENTITY torSettings.configurePrompt1 Den hÃ¤r datorns Internetanslutning Ã¤r 
censorerad eller gÃ¥r genom en proxy.
+!ENTITY torSettings.configurePrompt2 Jag behÃ¶ver konfigurera brygg- eller 
proxyinstÃ¤llningar.
 !ENTITY torSettings.configure Konfigurera
 !ENTITY torSettings.connectPrompt2 Jag vill ansluta direkt till 
Tor-nÃ¤tverket.
 !ENTITY torSettings.connectPrompt3 Detta fungerar i de flesta situationer.
@@ -19,9 +19,6 @@
 !-- see https://www.torproject.org/docs/proxychain.html.en --
 !ENTITY torSettings.proxyHelp Om du Ã¤r osÃ¤ker pÃ¥ hur du ska svara pÃ¥ 
denna frÃ¥ga, titta efter i Internet-instÃ¤llningarna i en annan webblÃ¤sare 
fÃ¶r att se om den Ã¤r konfigurerad att anvÃ¤nda en proxy.
 !ENTITY torSettings.enterProxy Ange proxyinstÃ¤llningarna.
-!ENTITY torSettings.firewallQuestion Ansluter den hÃ¤r datorn till Internet 
genom en brandvÃ¤gg som bara tillÃ¥ter anslutningar pÃ¥ vissa specifika 
portar?
-!ENTITY torSettings.firewallHelp Om du Ã¤r osÃ¤ker pÃ¥ hur du ska svara pÃ¥ 
denna frÃ¥ga, vÃ¤lj Nej. Om du dÃ¥ fÃ¥r problem med att ansluta till 
Tor-nÃ¤tverket, Ã¤ndra denna instÃ¤llning till Ja.
-!ENTITY torSettings.enterFirewall Ange en komma-separerad lista Ã¶ver portar 
som brandvÃ¤ggen tillÃ¥ter.
 !ENTITY torSettings.bridgeQuestion Blockerar eller censurerar din 
internetleverantÃ¶r anslutningar till Tor-nÃ¤tverket?
 !ENTITY torSettings.bridgeHelp Om du Ã¤r osÃ¤ker pÃ¥ hur du ska svara pÃ¥ 
den hÃ¤r frÃ¥gan, vÃ¤lj Nej.#160; Om du vÃ¤ljer Ja kommer du ombes att 
konfigurera Tor-bryggor, vilka Ã¤r olistade relÃ¤er som gÃ¶r det svÃ¥rare att 
blockera anslutningar till Tor-nÃ¤tverket.
 !ENTITY torSettings.bridgeSettingsPrompt Du kan anvÃ¤nda de 
fÃ¶rkonfigurerade bryggorna, eller skaffa och ange bryggor sjÃ¤lv.
@@ -29,7 +26,7 @@
 !-- Other: --
 
 !ENTITY torsettings.startingTor VÃ¤ntar pÃ¥ att Tor ska starta...
-!ENTITY torsettings.restart Starta om
+!ENTITY torsettings.restartTor Starta om Tor
 
 !ENTITY torsettings.optional Valfri
 
@@ -59,6 +56,7 @@
 !ENTITY torsettings.bridgeHelp2Heading Via nÃ¤tet
 !ENTITY torsettings.bridgeHelp2 AnvÃ¤nd en webblÃ¤sare fÃ¶r att besÃ¶ka 
https://bridges.torproject.org;
 !ENTITY torsettings.bridgeHelp3Heading Via e-post autosvar
-!ENTITY torsettings.bridgeHelp3 Skicka ett e-post meddelande till 
brid...@torproject.org med endast raden quot;get bridgesquot; i texten.#160; 
Emellertid, fÃ¶r att gÃ¶ra det svÃ¥rare fÃ¶r en angripare Ã¤r ta reda pÃ¥ en 
massa bryggadresser, mÃ¥ste du skicka detta meddelande frÃ¥n ett gmail.com 
eller yahoo.com konto.
+!ENTITY torsettings.bridgeHelp3.emailDesc Skicka ett e-postmeddelande till 
brid...@torproject.org med bara quot;get bridgesquot; i texten.#160; Men 
fÃ¶r att gÃ¶ra det svÃ¥rare fÃ¶r en angripare att fÃ¥ tag pÃ¥ mÃ¥nga adresser 
till bryggor sÃ¥ mÃ¥ste du skicka meddelandet frÃ¥n nÃ¥gon av fÃ¶ljande 
epostleverantÃ¶rer (listan Ã¤r sorterad pÃ¥ vilka vi fÃ¶redrar):
+!ENTITY torsettings.bridgeHelp3.emailList https://www.riseup.net, 
https://mail.google.com, eller https://mail.yahoo.com;
 !ENTITY torsettings.bridgeHelp4Heading Via supporten
 !ENTITY torsettings.bridgeHelp4 Som en sista utvÃ¤g kan du skicka ett artigt 
e-post meddelande pÃ¥ engelska till h...@rt.torproject.org, och frÃ¥ga efter 
bryggadresser.#160; TÃ¤nk pÃ¥ att en person mÃ¥ste svara pÃ¥ varje sÃ¥dan 
fÃ¶rfrÃ¥gan.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 a/sv/torlauncher.properties b/sv/torlauncher.properties
index d23b5e7..d3ad802 100644
--- a/sv/torlauncher.properties
+++ b/sv/torlauncher.properties
@@ -30,7 +30,7 @@ torlauncher.error_bridge_bad_default_type=Det finns inga 
fÃ¶rkonfigurerade brygg
 torlauncher.recommended_bridge=(rekommenderas)
 
 torlauncher.connect=Anslut
-torlauncher.restart_tor=Restart Tor
+torlauncher.restart_tor=Starta om Tor
 torlauncher.quit=Avsluta
 torlauncher.quit_win=StÃ¤ng
 torlauncher.done=Klar

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 a/de/https-everywhere.dtd b/de/https-everywhere.dtd
index b60a869..b1da3c0 100644
--- a/de/https-everywhere.dtd
+++ b/de/https-everywhere.dtd
@@ -37,7 +37,7 @@
 
 !ENTITY https-everywhere.popup.title Nachricht von HTTPS-Everywhere 
4.0development.11
 !ENTITY https-everywhere.popup.paragraph1 Ups. Sie haben die stabile Version 
von HTTPS-Everywhere benutzt, aber wir haben Sie mÃ¶glicherweise in unserer 
letzten Aktualisierung auf eine Entwicklerversion aktualisiert.
-!ENTITY https-everywhere.popup.paragraph2 MÃ¶chtest Sie zurÃ¼ck zur stabilen 
Version?
+!ENTITY https-everywhere.popup.paragraph2 MÃ¶chten Sie zurÃ¼ck zur stabilen 
Version?
 !ENTITY https-everywhere.popup.paragraph3 Wir wÃ¼rden uns freuen, wenn Sie 
weiterhin die Entwicklerversion benutzen wÃ¼rden, um uns zu helfen 
HTTPS-Everywhere zu verbessern! Es kÃ¶nnte sein, dass Sie hier und da einige 
Fehler finden, welche Sie an https-everywh...@eff.org melden kÃ¶nnen. 
Entschuldigen Sie die Unannehmlichkeit und danke, dass Sie HTTPS-Everywhere 
benutzen.
 !ENTITY https-everywhere.popup.keep Entwicklerversion beibehalten.
 !ENTITY https-everywhere.popup.revert Die letzte stabile Version 
herunterladen

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 9dc38af..d4a7aed 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
 POT-Creation-Date: 2014-07-26 02:11+\n
-PO-Revision-Date: 2014-09-20 08:15+\n
+PO-Revision-Date: 2014-09-20 09:06+\n
 Last-Translator: phst transi...@sturman.se\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 a/de/torcheck.po b/de/torcheck.po
index 67eb162..9cfdef3 100644
--- a/de/torcheck.po
+++ b/de/torcheck.po
@@ -4,6 +4,7 @@
 # Translators:
 # annskaja annsk...@riseup.net, 2014
 # axcer ax...@gmx.de, 2014
+# gerhard listmem...@rinnberger.de, 2014
 # LaKoon lak...@posteo.org, 2011
 # Mario Baier mario.baie...@gmx.de, 2013
 # Rechi95 re...@aon.at, 2014
@@ -15,8 +16,8 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 POT-Creation-Date: 2012-02-16 20:28+PDT\n
-PO-Revision-Date: 2014-09-02 11:40+\n
-Last-Translator: Stormbr3aker turboden...@t-online.de\n
+PO-Revision-Date: 2014-09-20 09:10+\n
+Last-Translator: gerhard listmem...@rinnberger.de\n
 Language-Team: German 
(http://www.transifex.com/projects/p/torproject/language/de/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -81,7 +82,7 @@ msgid Learn More raquo;
 msgstr Mehr erfahren raquo;
 
 msgid Go
-msgstr Gehen zu
+msgstr Gehe zu
 
 msgid Short User Manual
 msgstr Kurzes Benutzerhandbuch

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 9dc38af..d4a7aed 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
 POT-Creation-Date: 2014-07-26 02:11+\n
-PO-Revision-Date: 2014-09-20 08:15+\n
+PO-Revision-Date: 2014-09-20 09:06+\n
 Last-Translator: phst transi...@sturman.se\n
 Language-Team: Swedish 
(http://www.transifex.com/projects/p/torproject/language/sv/)\n
 MIME-Version: 1.0\n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 b/de/torcheck.po
index 67eb162..9cfdef3 100644
--- a/de/torcheck.po
+++ b/de/torcheck.po
@@ -4,6 +4,7 @@
 # Translators:
 # annskaja annsk...@riseup.net, 2014
 # axcer ax...@gmx.de, 2014
+# gerhard listmem...@rinnberger.de, 2014
 # LaKoon lak...@posteo.org, 2011
 # Mario Baier mario.baie...@gmx.de, 2013
 # Rechi95 re...@aon.at, 2014
@@ -15,8 +16,8 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 POT-Creation-Date: 2012-02-16 20:28+PDT\n
-PO-Revision-Date: 2014-09-02 11:40+\n
-Last-Translator: Stormbr3aker turboden...@t-online.de\n
+PO-Revision-Date: 2014-09-20 09:10+\n
+Last-Translator: gerhard listmem...@rinnberger.de\n
 Language-Team: German 
(http://www.transifex.com/projects/p/torproject/language/de/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -81,7 +82,7 @@ msgid Learn More raquo;
 msgstr Mehr erfahren raquo;
 
 msgid Go
-msgstr Gehen zu
+msgstr Gehe zu
 
 msgid Short User Manual
 msgstr Kurzes Benutzerhandbuch

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 a/de/https-everywhere.dtd b/de/https-everywhere.dtd
index b60a869..b1da3c0 100644
--- a/de/https-everywhere.dtd
+++ b/de/https-everywhere.dtd
@@ -37,7 +37,7 @@
 
 !ENTITY https-everywhere.popup.title Nachricht von HTTPS-Everywhere 
4.0development.11
 !ENTITY https-everywhere.popup.paragraph1 Ups. Sie haben die stabile Version 
von HTTPS-Everywhere benutzt, aber wir haben Sie mÃ¶glicherweise in unserer 
letzten Aktualisierung auf eine Entwicklerversion aktualisiert.
-!ENTITY https-everywhere.popup.paragraph2 MÃ¶chtest Sie zurÃ¼ck zur stabilen 
Version?
+!ENTITY https-everywhere.popup.paragraph2 MÃ¶chten Sie zurÃ¼ck zur stabilen 
Version?
 !ENTITY https-everywhere.popup.paragraph3 Wir wÃ¼rden uns freuen, wenn Sie 
weiterhin die Entwicklerversion benutzen wÃ¼rden, um uns zu helfen 
HTTPS-Everywhere zu verbessern! Es kÃ¶nnte sein, dass Sie hier und da einige 
Fehler finden, welche Sie an https-everywh...@eff.org melden kÃ¶nnen. 
Entschuldigen Sie die Unannehmlichkeit und danke, dass Sie HTTPS-Everywhere 
benutzen.
 !ENTITY https-everywhere.popup.keep Entwicklerversion beibehalten.
 !ENTITY https-everywhere.popup.revert Die letzte stabile Version 
herunterladen

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 --git a/eu/LC_MESSAGES/bridgedb.po b/eu/LC_MESSAGES/bridgedb.po
index 6da4093..d7b56e2 100644
--- a/eu/LC_MESSAGES/bridgedb.po
+++ b/eu/LC_MESSAGES/bridgedb.po
@@ -5,13 +5,14 @@
 # Translators:
 # Antxon Baldarra balda...@bitmessage.ch, 2013
 # Antxon Baldarra balda...@bitmessage.ch, 2011, 2012
+# Egoitz Rodriguez Obieta egoitz...@hotmail.com, 2014
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
 POT-Creation-Date: 2014-07-26 02:11+\n
-PO-Revision-Date: 2014-07-26 09:42+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2014-09-20 14:00+\n
+Last-Translator: Egoitz Rodriguez Obieta egoitz...@hotmail.com\n
 Language-Team: Basque 
(http://www.transifex.com/projects/p/torproject/language/eu/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -33,7 +34,7 @@ msgstr 
 #. Tor Browser
 #: lib/bridgedb/HTTPServer.py:121
 msgid Sorry! Something went wrong with your request.
-msgstr 
+msgstr Barkatu! Zerbait gaizki joan da zure eskaeran.
 
 #: lib/bridgedb/strings.py:18
 msgid [This is an automated message; please do not reply.]
@@ -41,7 +42,7 @@ msgstr [Hau mezu automatizatu bat da, mesedez ez erantzun.]
 
 #: lib/bridgedb/strings.py:20
 msgid Here are your bridges:
-msgstr 
+msgstr Hona hemen zure zubiak:
 
 #: lib/bridgedb/strings.py:22
 #, python-format
@@ -58,7 +59,7 @@ msgstr 
 #. TRANSLATORS: Please DO NOT translate the word BridgeDB.
 #: lib/bridgedb/strings.py:28
 msgid Welcome to BridgeDB!
-msgstr 
+msgstr Ongi Etorri BridgeDB-ra!
 
 #. TRANSLATORS: Please DO NOT translate the words transport or TYPE.
 #: lib/bridgedb/strings.py:30
@@ -68,15 +69,15 @@ msgstr 
 #: lib/bridgedb/strings.py:31
 #, python-format
 msgid Hey, %s!
-msgstr 
+msgstr Kaixo, %s!
 
 #: lib/bridgedb/strings.py:32
 msgid Hello, friend!
-msgstr 
+msgstr Kaixo, lagun!
 
 #: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
 msgid Public Keys
-msgstr 
+msgstr Gako Publikoak
 
 #. TRANSLATORS: This string will end up saying something like:
 #. This email was generated with rainbows, unicorns, and sparkles

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 insertions(+), 22 deletions(-)

diff --git a/eu/eu.po b/eu/eu.po
index 3033e3c..b1f3c56 100644
--- a/eu/eu.po
+++ b/eu/eu.po
@@ -5,15 +5,16 @@
 # Translators:
 # Antxon Baldarra balda...@bitmessage.ch, 2013
 # Antxon Baldarra balda...@bitmessage.ch, 2012
-# Debatik mundura!, 2013
+# @atzerritik, 2013
+# Egoitz Rodriguez Obieta egoitz...@hotmail.com, 2014
 # totorika93 totorik...@gmail.com, 2012
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
-POT-Creation-Date: 2014-04-16 21:26+0200\n
-PO-Revision-Date: 2014-04-17 09:09+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+POT-Creation-Date: 2014-07-01 22:15+0200\n
+PO-Revision-Date: 2014-09-20 13:50+\n
+Last-Translator: Egoitz Rodriguez Obieta egoitz...@hotmail.com\n
 Language-Team: Basque 
(http://www.transifex.com/projects/p/torproject/language/eu/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -122,67 +123,67 @@ msgstr `dotfiles' direktorioan aurkitutako edozein 
fitxategi edo direktorio $HO
 msgid Setup Tails persistent volume
 msgstr Konfiguratu Tailsen bolumen iraunkorra
 
-#: ../lib/Tails/Persistence/Setup.pm:337
+#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:452
+msgid Error
+msgstr Akatsa
+
+#: ../lib/Tails/Persistence/Setup.pm:339
 #, perl-format
 msgid Device %s already has a persistent volume.
 msgstr %s gailuak dagoeneko bolumen iraunkor bat dauka.
 
-#: ../lib/Tails/Persistence/Setup.pm:345
+#: ../lib/Tails/Persistence/Setup.pm:347
 #, perl-format
 msgid Device %s has not enough unallocated space.
 msgstr %s gailuak ez dauka esleitu gabeko nahiko espaziorik.
 
-#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367
+#: ../lib/Tails/Persistence/Setup.pm:355 ../lib/Tails/Persistence/Setup.pm:369
 #, perl-format
 msgid Device %s has no persistent volume.
 msgstr %s gailuak ez dauka bolumen iraunkorrik.
 
-#: ../lib/Tails/Persistence/Setup.pm:359
+#: ../lib/Tails/Persistence/Setup.pm:361
 msgid 
 Cannot delete the persistent volume while in use. You should restart Tails 
 without persistence.
 msgstr Ezin da bolumen iraunkorra ezabatu erabilia izaten ari den bitartean. 
Tails iraunkortasunik gabe berrabiarazi beharko zenuke.
 
-#: ../lib/Tails/Persistence/Setup.pm:378
+#: ../lib/Tails/Persistence/Setup.pm:380
 msgid Persistence volume is not unlocked.
 msgstr Bolumen iraunkorra desblokeatuta dago.
 
-#: ../lib/Tails/Persistence/Setup.pm:383
+#: ../lib/Tails/Persistence/Setup.pm:385
 msgid Persistence volume is not mounted.
 msgstr Bolumen iraunkorra ez dago muntatuta.
 
-#: ../lib/Tails/Persistence/Setup.pm:388
+#: ../lib/Tails/Persistence/Setup.pm:390
 msgid Persistence volume is not readable. Permissions or ownership problems?
 msgstr Bolumen iraunkorra ezin da irakurri. Baimen edo jabetza arazoak?
 
-#: ../lib/Tails/Persistence/Setup.pm:393
+#: ../lib/Tails/Persistence/Setup.pm:395
 msgid Persistence volume is not writable. Maybe it was mounted read-only?
 msgstr Bolumen iraunkorrean ezin da idatzi. Irakurtzeko soilik muntatu al zen 
agian?
 
-#: ../lib/Tails/Persistence/Setup.pm:402
+#: ../lib/Tails/Persistence/Setup.pm:404
 #, perl-format
 msgid Tails is running from non-USB / non-SDIO device %s.
 msgstr Tails ez USB / ez SDIO %s gailu batetik exekutatzen ari da.
 
-#: ../lib/Tails/Persistence/Setup.pm:408
+#: ../lib/Tails/Persistence/Setup.pm:410
 #, perl-format
 msgid Device %s is optical.
 msgstr %s gailua optikoa da.
 
-#: ../lib/Tails/Persistence/Setup.pm:415
+#: ../lib/Tails/Persistence/Setup.pm:417
 #, perl-format
 msgid Device %s was not created using Tails Installer.
-msgstr 
-
-#: ../lib/Tails/Persistence/Setup.pm:450
-msgid Error
-msgstr Akatsa
+msgstr %s gailua ez zen Tails Instalatzailea erabiliz sortu.
 
-#: ../lib/Tails/Persistence/Setup.pm:670
+#: ../lib/Tails/Persistence/Setup.pm:677
 msgid Persistence wizard - Finished
 msgstr Iraunkortasun morroia - Amaituta
 
-#: ../lib/Tails/Persistence/Setup.pm:673
+#: ../lib/Tails/Persistence/Setup.pm:680
 msgid 
 Any changes you have made will only take effect after restarting Tails.\n
 \n

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 changed, 31 insertions(+), 30 deletions(-)

diff --git a/eu/eu.po b/eu/eu.po
index 9d785a9..b1f3c56 100644
--- a/eu/eu.po
+++ b/eu/eu.po
@@ -5,15 +5,16 @@
 # Translators:
 # Antxon Baldarra balda...@bitmessage.ch, 2013
 # Antxon Baldarra balda...@bitmessage.ch, 2012
-# Debatik mundura!, 2013
+# @atzerritik, 2013
+# Egoitz Rodriguez Obieta egoitz...@hotmail.com, 2014
 # totorika93 totorik...@gmail.com, 2012
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
-POT-Creation-Date: 2013-11-15 11:30+0100\n
-PO-Revision-Date: 2013-12-19 16:00+\n
-Last-Translator: Antxon Baldarra balda...@bitmessage.ch\n
+POT-Creation-Date: 2014-07-01 22:15+0200\n
+PO-Revision-Date: 2014-09-20 13:50+\n
+Last-Translator: Egoitz Rodriguez Obieta egoitz...@hotmail.com\n
 Language-Team: Basque 
(http://www.transifex.com/projects/p/torproject/language/eu/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -118,71 +119,71 @@ msgid 
 Symlink into $HOME every file or directory found in the `dotfiles' directory
 msgstr `dotfiles' direktorioan aurkitutako edozein fitxategi edo direktorio 
$HOME era esteka sinbolikoa egin.
 
-#: ../lib/Tails/Persistence/Setup.pm:226
+#: ../lib/Tails/Persistence/Setup.pm:227
 msgid Setup Tails persistent volume
 msgstr Konfiguratu Tailsen bolumen iraunkorra
 
-#: ../lib/Tails/Persistence/Setup.pm:330
+#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:452
+msgid Error
+msgstr Akatsa
+
+#: ../lib/Tails/Persistence/Setup.pm:339
 #, perl-format
 msgid Device %s already has a persistent volume.
 msgstr %s gailuak dagoeneko bolumen iraunkor bat dauka.
 
-#: ../lib/Tails/Persistence/Setup.pm:338
+#: ../lib/Tails/Persistence/Setup.pm:347
 #, perl-format
 msgid Device %s has not enough unallocated space.
 msgstr %s gailuak ez dauka esleitu gabeko nahiko espaziorik.
 
-#: ../lib/Tails/Persistence/Setup.pm:346 ../lib/Tails/Persistence/Setup.pm:360
+#: ../lib/Tails/Persistence/Setup.pm:355 ../lib/Tails/Persistence/Setup.pm:369
 #, perl-format
 msgid Device %s has no persistent volume.
 msgstr %s gailuak ez dauka bolumen iraunkorrik.
 
-#: ../lib/Tails/Persistence/Setup.pm:352
+#: ../lib/Tails/Persistence/Setup.pm:361
 msgid 
 Cannot delete the persistent volume while in use. You should restart Tails 
 without persistence.
 msgstr Ezin da bolumen iraunkorra ezabatu erabilia izaten ari den bitartean. 
Tails iraunkortasunik gabe berrabiarazi beharko zenuke.
 
-#: ../lib/Tails/Persistence/Setup.pm:371
+#: ../lib/Tails/Persistence/Setup.pm:380
 msgid Persistence volume is not unlocked.
 msgstr Bolumen iraunkorra desblokeatuta dago.
 
-#: ../lib/Tails/Persistence/Setup.pm:376
+#: ../lib/Tails/Persistence/Setup.pm:385
 msgid Persistence volume is not mounted.
 msgstr Bolumen iraunkorra ez dago muntatuta.
 
-#: ../lib/Tails/Persistence/Setup.pm:381
+#: ../lib/Tails/Persistence/Setup.pm:390
 msgid Persistence volume is not readable. Permissions or ownership problems?
 msgstr Bolumen iraunkorra ezin da irakurri. Baimen edo jabetza arazoak?
 
-#: ../lib/Tails/Persistence/Setup.pm:386
+#: ../lib/Tails/Persistence/Setup.pm:395
 msgid Persistence volume is not writable. Maybe it was mounted read-only?
 msgstr Bolumen iraunkorrean ezin da idatzi. Irakurtzeko soilik muntatu al zen 
agian?
 
-#: ../lib/Tails/Persistence/Setup.pm:395
+#: ../lib/Tails/Persistence/Setup.pm:404
 #, perl-format
 msgid Tails is running from non-USB / non-SDIO device %s.
 msgstr Tails ez USB / ez SDIO %s gailu batetik exekutatzen ari da.
 
-#: ../lib/Tails/Persistence/Setup.pm:401
+#: ../lib/Tails/Persistence/Setup.pm:410
 #, perl-format
 msgid Device %s is optical.
 msgstr %s gailua optikoa da.
 
-#: ../lib/Tails/Persistence/Setup.pm:408
+#: ../lib/Tails/Persistence/Setup.pm:417
 #, perl-format
-msgid Device %s was not created using Tails USB installer.
-msgstr %s gailua ez zen Tails USB instalatzailea erabiliz sortu.
-
-#: ../lib/Tails/Persistence/Setup.pm:443
-msgid Error
-msgstr Akatsa
+msgid Device %s was not created using Tails Installer.
+msgstr %s gailua ez zen Tails Instalatzailea erabiliz sortu.
 
-#: ../lib/Tails/Persistence/Setup.pm:658
+#: ../lib/Tails/Persistence/Setup.pm:677
 msgid Persistence wizard - Finished
 msgstr Iraunkortasun morroia - Amaituta
 
-#: ../lib/Tails/Persistence/Setup.pm:661
+#: ../lib/Tails/Persistence/Setup.pm:680
 msgid 
 Any changes you have made will only take effect after restarting Tails.\n
 \n
@@ -291,28 +292,28 @@ msgstr Gordetzen...
 msgid Saving persistence configuration...
 msgstr Iraunkortasun konfigurazioa gordetzen...
 
-#: ../lib/Tails/Persistence/Step/Delete.pm:40
+#:

[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 insertions(+), 29 deletions(-)

diff --git a/eu.po b/eu.po
index 09b4e8c..740acc0 100644
--- a/eu.po
+++ b/eu.po
@@ -1,11 +1,12 @@
 # 
 # Translators:
+# Egoitz Rodriguez Obieta egoitz...@hotmail.com, 2014
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-POT-Creation-Date: 2014-05-24 16:09+\n
-PO-Revision-Date: 2014-05-25 09:55+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+POT-Creation-Date: 2014-07-17 14:23+\n
+PO-Revision-Date: 2014-09-20 14:00+\n
+Last-Translator: Egoitz Rodriguez Obieta egoitz...@hotmail.com\n
 Language-Team: Basque 
(http://www.transifex.com/projects/p/torproject/language/eu/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -25,111 +26,111 @@ msgstr 
 #: C/tor-and-https.svg:14
 #, no-wrap
 msgid Tor and HTTPS
-msgstr 
+msgstr Tor eta HTTPS
 
 #. (itstool) path: defs/text
 #. Keep it short: 7em max. Seven times the capital letter M.
-#: C/tor-and-https.svg:348
+#: C/tor-and-https.svg:363
 #, no-wrap
 msgid Site.com
 msgstr 
 
 #. (itstool) path: defs/text
 #. Keep it short: 7em max. Seven times the capital letter M.
-#: C/tor-and-https.svg:348
+#: C/tor-and-https.svg:363
 #, no-wrap
 msgid user / pw
-msgstr 
+msgstr erabiltzaile / pasahitza
 
 #. (itstool) path: defs/text
 #. Keep it short: 7em max. Seven times the capital letter M.
-#: C/tor-and-https.svg:348
+#: C/tor-and-https.svg:363
 #, no-wrap
 msgid data
 msgstr 
 
 #. (itstool) path: defs/text
 #. Keep it short: 7em max. Seven times the capital letter M.
-#: C/tor-and-https.svg:348
+#: C/tor-and-https.svg:363
 #, no-wrap
 msgid location
 msgstr 
 
 #. (itstool) path: defs/text
 #. Keep it short: 3em max.
-#: C/tor-and-https.svg:348
+#: C/tor-and-https.svg:363
 #, no-wrap
 msgid WiFi
-msgstr 
+msgstr WiFi
 
 #. (itstool) path: defs/text
 #. Keep it short: 4em max.
-#: C/tor-and-https.svg:348
+#: C/tor-and-https.svg:363
 #, no-wrap
 msgid ISP
-msgstr 
+msgstr ISP
 
 #. (itstool) path: defs/text
 #. Keep it short: 8em is ok, 9em is max.
-#: C/tor-and-https.svg:348
+#: C/tor-and-https.svg:363
 #, no-wrap
 msgid Hacker
-msgstr 
+msgstr Hacker-a
 
 #. (itstool) path: defs/text
 #. Keep it short: 8em is ok, 9em is max.
-#: C/tor-and-https.svg:348
+#: C/tor-and-https.svg:363
 #, no-wrap
 msgid Lawyer
-msgstr 
+msgstr Legelaria
 
 #. (itstool) path: defs/text
 #. Keep it short: 8em is ok, 9em is max.
-#: C/tor-and-https.svg:348
+#: C/tor-and-https.svg:363
 #, no-wrap
 msgid Sysadmin
-msgstr 
+msgstr Sistema administratzaile
 
 #. (itstool) path: defs/text
 #. Keep it short: 8em is ok, 9em is max.
-#: C/tor-and-https.svg:348
+#: C/tor-and-https.svg:363
 #, no-wrap
 msgid Police
-msgstr 
+msgstr Polizia
 
 #. (itstool) path: defs/text
-#: C/tor-and-https.svg:348
+#: C/tor-and-https.svg:363
 #, no-wrap
 msgid NSA
 msgstr 
 
 #. (itstool) path: defs/text
 #. Keep it short: 8em is ok, 9em is max.
-#: C/tor-and-https.svg:348
+#: C/tor-and-https.svg:363
 #, no-wrap
 msgid Tor relay
 msgstr 
 
 #. (itstool) path: defs/text
-#: C/tor-and-https.svg:348
+#: C/tor-and-https.svg:363
 #, no-wrap
 msgid Key
-msgstr 
+msgstr Gakoa
 
 #. (itstool) path: defs/text
-#: C/tor-and-https.svg:348
+#: C/tor-and-https.svg:363
 #, no-wrap
 msgid Internet connection
-msgstr 
+msgstr Interneteko konexioa
 
 #. (itstool) path: defs/text
-#: C/tor-and-https.svg:348
+#: C/tor-and-https.svg:363
 #, no-wrap
 msgid Eavesdropping
 msgstr 
 
 #. (itstool) path: defs/text
-#: C/tor-and-https.svg:348
+#: C/tor-and-https.svg:363
 #, no-wrap
 msgid Data sharing
 msgstr 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 a/eu.po b/eu.po
index 39b8df5..89b3a7a 100644
--- a/eu.po
+++ b/eu.po
@@ -5,13 +5,14 @@
 # Translators:
 # jonbraun ahand...@gmail.com, 2014
 # Antxon Baldarra balda...@bitmessage.ch, 2014
+# Egoitz Rodriguez Obieta egoitz...@hotmail.com, 2014
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2014-05-29 00:14+0200\n
-PO-Revision-Date: 2014-05-29 08:50+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+POT-Creation-Date: 2014-08-31 21:41+0200\n
+PO-Revision-Date: 2014-09-20 16:40+\n
+Last-Translator: Egoitz Rodriguez Obieta egoitz...@hotmail.com\n
 Language-Team: Basque 
(http://www.transifex.com/projects/p/torproject/language/eu/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -25,7 +26,7 @@ msgstr Tor prest dago
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:44
 msgid You can now access the Internet.
-msgstr 
+msgstr Orain, Internetera sar zaitezke.
 
 #: config/chroot_local-includes/etc/whisperback/config.py:64
 #, python-format
@@ -216,15 +217,15 @@ msgstr Utzi
 
 #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:39
 msgid Shutdown Immediately
-msgstr 
+msgstr Orain bertan itzali
 
 #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:40
 msgid Reboot Immediately
-msgstr 
+msgstr Orain bertan berrabiarazi
 
 #: config/chroot_local-includes/usr/local/bin/tails-about:16
 msgid not available
-msgstr 
+msgstr ez dago eskuragarri
 
 #: config/chroot_local-includes/usr/local/bin/tails-about:19
 #: 
../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1
@@ -281,7 +282,7 @@ msgstr 
 
 #: 
config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38
 msgid Network connection blocked?
-msgstr 
+msgstr Sare konexioa blokeaturik ahal dago?
 
 #: 
config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40
 msgid 
@@ -414,32 +415,32 @@ msgstr 
 msgid Failed to setup chroot.
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:175
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182
 #: 
../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
 msgid Unsafe Browser
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:215
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:204
 msgid Shutting down the Unsafe Browser...
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:216
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:205
 msgid 
 This may take a while, and you may not restart the Unsafe Browser until it 
 is properly shut down.
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:228
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:217
 msgid Failed to restart Tor.
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225
 msgid 
 Another Unsafe Browser is currently running, or being cleaned up. Please 
 retry in a while.
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:238
 msgid 
 No DNS server was obtained through DHCP or manually configured in 
 NetworkManager.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 740acc0..19286d4 100644
--- a/eu.po
+++ b/eu.po
@@ -5,7 +5,7 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 POT-Creation-Date: 2014-07-17 14:23+\n
-PO-Revision-Date: 2014-09-20 14:00+\n
+PO-Revision-Date: 2014-09-20 16:30+\n
 Last-Translator: Egoitz Rodriguez Obieta egoitz...@hotmail.com\n
 Language-Team: Basque 
(http://www.transifex.com/projects/p/torproject/language/eu/)\n
 MIME-Version: 1.0\n
@@ -47,14 +47,14 @@ msgstr erabiltzaile / pasahitza
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid data
-msgstr 
+msgstr datuak
 
 #. (itstool) path: defs/text
 #. Keep it short: 7em max. Seven times the capital letter M.
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid location
-msgstr 
+msgstr kokapena
 
 #. (itstool) path: defs/text
 #. Keep it short: 3em max.
@@ -133,4 +133,4 @@ msgstr 
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid Data sharing
-msgstr 
+msgstr Datu partekatzea

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 changed, 56 insertions(+)

diff --git a/README b/README
index 47639ed..b216059 100644
--- a/README
+++ b/README
@@ -58,6 +58,11 @@ latencytest:
 A test program for App Engine that measures roundtrip times to different
 destinations.
 
+php:
+A php reflector similar to the appengine one above. Ideally, it can be run on
+any platform that supports php. A public instance is at:
+https://meek-reflect.herokuapp.com/
+
 To the extent possible under law, the authors have dedicated all
 copyright and related and neighboring rights to this software to the
 public domain worldwide. This software is distributed without any
diff --git a/php/README b/php/README
new file mode 100644
index 000..1df27d5
--- /dev/null
+++ b/php/README
@@ -0,0 +1,13 @@
+Ideally, this component can run on any platform that supports PHP. It lies
+between meek-client and meek-server, and receives requests from the client and
+forwards them to the server, then receives responses from the server and
+forwards them to the client.
+
+To test locally, run:
+   php -S 127.0.0.1:8080
+
+The app will be running at http://127.0.0.1:8080/. To configure meek-client to
+talk to the locally running app, put this in torrc:
+   UseBridges 1
+   Bridge meek 0.0.2.0:1
+   ClientTransportPlugin meek exec ./meek-client 
--url=http://127.0.0.1:8080/ --log meek-client.log
\ No newline at end of file
diff --git a/php/index.php b/php/index.php
new file mode 100644
index 000..b6fb9ef
--- /dev/null
+++ b/php/index.php
@@ -0,0 +1,38 @@
+?php
+
+   /**
+* A php reflector for meek.
+*/
+
+   $forwardURL = http://meek.bamsoftware.com:7002/;;
+
+   $headerArray = array();
+   if ( array_key_exists(HTTP_X_SESSION_ID, $_SERVER) ) {
+   $headerArray[] = X-Session-Id:  . 
$_SERVER[HTTP_X_SESSION_ID];
+   }
+
+   function HeaderFunc( $ch, $header ) {
+   if ( explode( :, $header )[0] == Content-Type ) {
+   header( $header );
+   }
+   return strlen( $header );
+   }
+
+   $curlOpt = array(
+   CURLOPT_HTTPHEADER = $headerArray,
+   CURLOPT_CUSTOMREQUEST = $_SERVER[REQUEST_METHOD],
+   CURLOPT_POSTFIELDS = file_get_contents(php://input),
+   CURLOPT_HEADERFUNCTION = HeaderFunc,
+   );
+
+   $ch = curl_init( $forwardURL );
+   curl_setopt_array( $ch, $curlOpt );
+
+   if ( !curl_exec( $ch ) ) {
+   header(HTTP/1.1 502 Bad Gateway);
+   echo 502 Bad Gateway\n;
+   }
+
+   curl_close( $ch );
+
+?
\ No newline at end of file

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 a/changes/bug13100 b/changes/bug13100
new file mode 100644
index 000..bbe43e6
--- /dev/null
+++ b/changes/bug13100
@@ -0,0 +1,3 @@
+  o Directory authority changes:
+- Change IP address for gabelmoo (v3 directory authority).
+
diff --git a/src/or/config.c b/src/or/config.c
index f6db98e..991c6fa 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -961,7 +961,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type)
   76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B,
 gabelmoo orport=443 no-v2 
   v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 
-  212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281,
+  131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281,
 dannenberg orport=443 no-v2 
   v3ident=585769C78764D58426B8B52B6651A5A71137189A 
   193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123,

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 a/changes/bug13100 b/changes/bug13100
new file mode 100644
index 000..bbe43e6
--- /dev/null
+++ b/changes/bug13100
@@ -0,0 +1,3 @@
+  o Directory authority changes:
+- Change IP address for gabelmoo (v3 directory authority).
+
diff --git a/src/or/config.c b/src/or/config.c
index f6db98e..991c6fa 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -961,7 +961,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type)
   76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B,
 gabelmoo orport=443 no-v2 
   v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 
-  212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281,
+  131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281,
 dannenberg orport=443 no-v2 
   v3ident=585769C78764D58426B8B52B6651A5A71137189A 
   193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 a/changes/bug13100 b/changes/bug13100
new file mode 100644
index 000..bbe43e6
--- /dev/null
+++ b/changes/bug13100
@@ -0,0 +1,3 @@
+  o Directory authority changes:
+- Change IP address for gabelmoo (v3 directory authority).
+
diff --git a/src/or/config.c b/src/or/config.c
index f6db98e..991c6fa 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -961,7 +961,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type)
   76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B,
 gabelmoo orport=443 no-v2 
   v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 
-  212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281,
+  131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281,
 dannenberg orport=443 no-v2 
   v3ident=585769C78764D58426B8B52B6651A5A71137189A 
   193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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  |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --cc src/or/config.c
index 31a3586,919dd27..39b85aa
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -856,23 -794,23 +856,23 @@@ add_default_trusted_dir_authorities(dir
86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D,
  dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 
194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755,
 -Tonga orport=443 bridge no-v2 82.94.251.203:80 
 +Tonga orport=443 bridge 82.94.251.203:80 
4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D,
 -turtles orport=9090 no-v2 
 +turtles orport=9090 
v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 
76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B,
 -gabelmoo orport=443 no-v2 
 +gabelmoo orport=443 
v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 
-   212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281,
+   131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281,
 -dannenberg orport=443 no-v2 
 +dannenberg orport=443 
v3ident=585769C78764D58426B8B52B6651A5A71137189A 
193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123,
 -urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C 
 +urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C 
208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417,
 -maatuska orport=80 no-v2 
 +maatuska orport=80 
v3ident=49015F787433103580E3B66A1707A00E60F2D15B 
171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810,
 -Faravahar orport=443 no-v2 
 +Faravahar orport=443 
v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 
154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC,
  NULL

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 a/changes/bug13100 b/changes/bug13100
new file mode 100644
index 000..bbe43e6
--- /dev/null
+++ b/changes/bug13100
@@ -0,0 +1,3 @@
+  o Directory authority changes:
+- Change IP address for gabelmoo (v3 directory authority).
+
diff --git a/src/or/config.c b/src/or/config.c
index f6db98e..991c6fa 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -961,7 +961,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type)
   76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B,
 gabelmoo orport=443 no-v2 
   v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 
-  212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281,
+  131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281,
 dannenberg orport=443 no-v2 
   v3ident=585769C78764D58426B8B52B6651A5A71137189A 
   193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 a/changes/bug13100 b/changes/bug13100
new file mode 100644
index 000..bbe43e6
--- /dev/null
+++ b/changes/bug13100
@@ -0,0 +1,3 @@
+  o Directory authority changes:
+- Change IP address for gabelmoo (v3 directory authority).
+
diff --git a/src/or/config.c b/src/or/config.c
index f6db98e..991c6fa 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -961,7 +961,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type)
   76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B,
 gabelmoo orport=443 no-v2 
   v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 
-  212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281,
+  131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281,
 dannenberg orport=443 no-v2 
   v3ident=585769C78764D58426B8B52B6651A5A71137189A 
   193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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  |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --cc src/or/config.c
index 31a3586,919dd27..39b85aa
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -856,23 -794,23 +856,23 @@@ add_default_trusted_dir_authorities(dir
86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D,
  dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 
194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755,
 -Tonga orport=443 bridge no-v2 82.94.251.203:80 
 +Tonga orport=443 bridge 82.94.251.203:80 
4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D,
 -turtles orport=9090 no-v2 
 +turtles orport=9090 
v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 
76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B,
 -gabelmoo orport=443 no-v2 
 +gabelmoo orport=443 
v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 
-   212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281,
+   131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281,
 -dannenberg orport=443 no-v2 
 +dannenberg orport=443 
v3ident=585769C78764D58426B8B52B6651A5A71137189A 
193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123,
 -urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C 
 +urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C 
208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417,
 -maatuska orport=80 no-v2 
 +maatuska orport=80 
v3ident=49015F787433103580E3B66A1707A00E60F2D15B 
171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810,
 -Faravahar orport=443 no-v2 
 +Faravahar orport=443 
v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 
154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC,
  NULL



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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  |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --cc src/or/config.c
index 31a3586,919dd27..39b85aa
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -856,23 -794,23 +856,23 @@@ add_default_trusted_dir_authorities(dir
86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D,
  dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 
194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755,
 -Tonga orport=443 bridge no-v2 82.94.251.203:80 
 +Tonga orport=443 bridge 82.94.251.203:80 
4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D,
 -turtles orport=9090 no-v2 
 +turtles orport=9090 
v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 
76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B,
 -gabelmoo orport=443 no-v2 
 +gabelmoo orport=443 
v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 
-   212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281,
+   131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281,
 -dannenberg orport=443 no-v2 
 +dannenberg orport=443 
v3ident=585769C78764D58426B8B52B6651A5A71137189A 
193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123,
 -urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C 
 +urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C 
208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417,
 -maatuska orport=80 no-v2 
 +maatuska orport=80 
v3ident=49015F787433103580E3B66A1707A00E60F2D15B 
171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810,
 -Faravahar orport=443 no-v2 
 +Faravahar orport=443 
v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 
154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC,
  NULL



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 a/ChangeLog b/ChangeLog
index e334c85..739e342 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 Changes in version 0.2.5.8-rc - 2014-09-2?
+  Tor 0.2.5.8-rc is the second release candidate for the Tor 0.2.5.x
+  series. It fixes a bug that affects consistency and speed when
+  connecting to hidden services, and it updates the location of one of
+  the directory authorities.
+
   o Major bugfixes:
 - Clients now send the correct address for their chosen rendezvous
   point when trying to access a hidden service. They used to send
@@ -13,6 +18,9 @@ Changes in version 0.2.5.8-rc - 2014-09-2?
   some users might have reduced their anonymity. Fixes bug 13151;
   bugfix on 0.2.1.5-alpha.
 
+  o Directory authority changes:
+- Change IP address for gabelmoo (v3 directory authority).
+
 
 Changes in version 0.2.5.7-rc - 2014-09-11
   Tor 0.2.5.7-rc fixes several regressions from earlier in the 0.2.5.x
diff --git a/changes/bug13100 b/changes/bug13100
deleted file mode 100644
index bbe43e6..000
--- a/changes/bug13100
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Directory authority changes:
-- Change IP address for gabelmoo (v3 directory authority).
-

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 changed, 133 insertions(+)

diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py
index bb783fb..2262db3 100644
--- a/lib/bridgedb/test/test_https.py
+++ b/lib/bridgedb/test/test_https.py
@@ -218,3 +218,136 @@ class HTTPTests(unittest.TestCase):
 self.assertEquals(PT, pt)
 self.assertTrue(password.find(password=) != -1,
 Password field missing expected text)
+
+def test_get_obfs4_ipv4(self):
+Try asking for obfs4 bridges, and check that the PT arguments in the
+returned bridge lines were space-separated.
+
+This is a regression test for #12932, see
+https://bugs.torproject.org/12932.
+
+if os.environ.get(CI):
+if not self.pid or not processExists(self.pid):
+raise FailTest(Could not start BridgeDB process on CI 
server!)
+if not self.pid or not processExists(self.pid):
+raise SkipTest(Can't run test: no BridgeDB process running.)
+
+self.openBrowser()
+self.goToOptionsPage()
+
+PT = 'obfs4'
+
+try:
+soup = self.submitOptions(transport=PT, ipv6=False,
+  captchaResponse=CAPTCHA_RESPONSE)
+except ValueError as error:
+if 'non-disabled' in str(error):
+raise SkipTest(Pluggable Transport obfs4 is currently 
disabled.)
+
+bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=6)
+for bridge in bridges:
+pt = bridge[0]
+ptArgs = bridge[-3:]
+self.assertEquals(PT, pt)
+self.assertTrue(len(ptArgs) == 3,
+(Expected obfs4 bridge line to have 3 PT args, 
+ found %d instead: %s) % (len(ptArgs), ptArgs))
+
+def test_get_obfs4_ipv4_iatmode(self):
+Ask for obfs4 bridges and check that there is an 'iat-mode' PT
+argument in the bridge lines.
+
+if os.environ.get(CI):
+if not self.pid or not processExists(self.pid):
+raise FailTest(Could not start BridgeDB process on CI 
server!)
+if not self.pid or not processExists(self.pid):
+raise SkipTest(Can't run test: no BridgeDB process running.)
+
+self.openBrowser()
+self.goToOptionsPage()
+
+PT = 'obfs4'
+
+try:
+soup = self.submitOptions(transport=PT, ipv6=False,
+  captchaResponse=CAPTCHA_RESPONSE)
+except ValueError as error:
+if 'non-disabled' in str(error):
+raise SkipTest(Pluggable Transport obfs4 is currently 
disabled.)
+
+bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=6)
+for bridge in bridges:
+ptArgs = bridge[-3:]
+hasIATMode = False
+for arg in ptArgs:
+if 'iat-mode' in arg:
+hasIATMode = True
+
+self.assertTrue(hasIATMode,
+obfs4 bridge line is missing 'iat-mode' PT arg.)
+
+def test_get_obfs4_ipv4_publickey(self):
+Ask for obfs4 bridges and check that there is an 'public-key' PT
+argument in the bridge lines.
+
+if os.environ.get(CI):
+if not self.pid or not processExists(self.pid):
+raise FailTest(Could not start BridgeDB process on CI 
server!)
+if not self.pid or not processExists(self.pid):
+raise SkipTest(Can't run test: no BridgeDB process running.)
+
+self.openBrowser()
+self.goToOptionsPage()
+
+PT = 'obfs4'
+
+try:
+soup = self.submitOptions(transport=PT, ipv6=False,
+  captchaResponse=CAPTCHA_RESPONSE)
+except ValueError as error:
+if 'non-disabled' in str(error):
+raise SkipTest(Pluggable Transport obfs4 is currently 
disabled.)
+
+bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=6)
+for bridge in bridges:
+ptArgs = bridge[-3:]
+hasPublicKey = False
+for arg in ptArgs:
+if 'public-key' in arg:
+hasPublicKey = True
+
+self.assertTrue(hasPublicKey,
+obfs4 bridge line is missing 'public-key' PT 
arg.)
+
+def test_get_obfs4_ipv4_nodeid(self):
+Ask for obfs4 bridges and check that there is an 'node-id' PT
+argument in the bridge lines.
+
+if os.environ.get(CI):
+if not self.pid or not processExists(self.pid):
+raise FailTest(Could

[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 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.test.requirements.txt b/.test.requirements.txt
index ca2c01c..78ad3c0 100644
--- a/.test.requirements.txt
+++ b/.test.requirements.txt
@@ -6,7 +6,7 @@
 # $ make coverage
 #
 coverage==3.7.1
-leekspin==1.0.0
+leekspin==1.1.3
 mechanize==0.2.5
 pep8==1.5.7
 # pylint must be pinned until pylint bug #203 is fixed. See
diff --git a/.travis.requirements.txt b/.travis.requirements.txt
index b10bae4..fcc4c77 100644
--- a/.travis.requirements.txt
+++ b/.travis.requirements.txt
@@ -15,7 +15,7 @@
 #--
 coverage==3.7.1
 coveralls==0.4.2
-leekspin==1.0.0
+leekspin==1.1.3
 mechanize==0.2.5
 pep8==1.5.7
 # pylint must be pinned until pylint bug #203 is fixed. See
diff --git a/setup.py b/setup.py
index 47a2cbf..d6f9a20 100644
--- a/setup.py
+++ b/setup.py
@@ -285,7 +285,7 @@ setuptools.setup(
 scripts=['scripts/bridgedb'],
 extras_require={'test': [sure==1.2.2,
  coverage==3.7.1,
- leekspin==1.0.0]},
+ leekspin==1.1.3]},
 zip_safe=False,
 cmdclass=get_cmdclass(),
 include_package_data=True,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 487c1b6c16e979bc448ddd415364e28bd764d29a, there were an
additional four bugs in the legacy parser,
`bridgedb.Bridges.parseExtraInfoFile()` (which I am about to deprecate
anyway for #9380):

   # get the transport line
   if ID and line.startswith(transport ):
   fields = line[10:].split()
   # [ arglist ] field, optional
   if len(fields) = 3:
   arglist = fields[2:]   # BUGS 1 and 2
   # parse arglist [k=v,...k=v] as argdict {k:v,...,k:v}
   argdict = {}
   for arg in arglist:
   try: k,v = arg.split('=')  # BUG 3
   except ValueError: continue# BUG 4
   argdict[k] = v
   logging.debug(  Parsing Argument: %s: %s, k, v)

  BUG 1: This assumes the PT arguments are space-separated in the
 extrainfo descriptor. They are not; they are comma-separated.

  BUG 2: This would result in parsing the entire, comma-separated group
 of PT arguments into:

 {key1: a,key2=b,key3=c}

  BUG 3: This would produce a ValueError, because there's more than one
 '=' character. (Meaning that the whole set of arguments would
 be discarded due to Bug #4.)

  BUG 4: The whole set of arguments gets discarded, without even so much
 as a log message, if there was more than one argument.

These are all bug fixes on a single commit,
4300329a30f3b6aa3e390b140193dd50faa6e03f, from #4568. And I'm still
deprecating the entire function anyway (for #9380) because the rest of
it is likely just as full of bugs.

 * FIXES #12932 https://bugs.torproject.org/12932
---
 lib/bridgedb/Bridges.py |   24 
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py
index 613e2db..a3f50b4 100644
--- a/lib/bridgedb/Bridges.py
+++ b/lib/bridgedb/Bridges.py
@@ -596,16 +596,24 @@ def parseExtraInfoFile(f):
 # get the transport line
 if ID and line.startswith(transport ):
 fields = line[10:].split()
-# [ arglist ] field, optional
+
 if len(fields) = 3:
-arglist = fields[2:]
-# parse arglist [k=v,...k=v] as argdict {k:v,...,k:v} 
 argdict = {}
-for arg in arglist:
-try: k,v = arg.split('=')
-except ValueError: continue
-argdict[k] = v
-logging.debug(  Parsing Argument: %s: %s, k, v)
+# PT argumentss are comma-separated in the extrainfo
+# descriptors. While there *shouldn't* be anything after them
+# that was separated by a space (and hence would wind up being
+# in a different `field`), if there was we'll join it to the
+# rest of the PT arguments with a comma so that they are
+# parsed as if they were PT arguments as well:
+allargs = ','.join(fields[2:])
+for arg in allargs.split(','):
+try:
+k, v = arg.split('=')
+except ValueError:
+logging.warn(  Couldn't parse K=V from PT arg: %r % 
arg)
+else:
+logging.debug(  Parsed PT Argument: %s: %s % (k, v))
+argdict[k] = v
 
 # get the required fields, method name and address
 if len(fields) = 2:



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 are functioning correctly. Because #12932 is
about the way PT arguments are presented to the user in the bridge
lines, to test the fixes for it, we must go through the UI (as the tests
in `lib/bridgedb/test/test_https.py` do).
---
 lib/bridgedb/templates/options.html |1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/bridgedb/templates/options.html 
b/lib/bridgedb/templates/options.html
index 2debbf1..e765ce7 100644
--- a/lib/bridgedb/templates/options.html
+++ b/lib/bridgedb/templates/options.html
@@ -89,6 +89,7 @@
 option label=none  value=0${_(none)}/option
 option label=obfs2 value=obfs2  obfs2/option
 option label=obfs3 value=obfs3   selected   obfs3/option
+option label=obfs4 value=obfs4  obfs4/option
 option label=scramblesuit value=scramblesuitscramblesuit/option
 option label=fte   value=ftefteproxy/option
   /select



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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, I'm leaving the HTTPS dropdown
item present but disabled, and nothing will be mentioned in emails sent
by the Email Distributor until the `obfs4` line in
`bridgedb.strings.CURRENT_TRANSPORTS is uncommented.
---
 lib/bridgedb/strings.py |1 +
 lib/bridgedb/templates/options.html |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/bridgedb/strings.py b/lib/bridgedb/strings.py
index bea2f5d..929c610 100644
--- a/lib/bridgedb/strings.py
+++ b/lib/bridgedb/strings.py
@@ -166,6 +166,7 @@ EMAIL_COMMANDS = {
 CURRENT_TRANSPORTS = [
 obfs2,
 obfs3,
+#obfs4,
 scramblesuit,
 fte,
 ]
diff --git a/lib/bridgedb/templates/options.html 
b/lib/bridgedb/templates/options.html
index e765ce7..79ac1df 100644
--- a/lib/bridgedb/templates/options.html
+++ b/lib/bridgedb/templates/options.html
@@ -89,7 +89,7 @@
 option label=none  value=0${_(none)}/option
 option label=obfs2 value=obfs2  obfs2/option
 option label=obfs3 value=obfs3   selected   obfs3/option
-option label=obfs4 value=obfs4  obfs4/option
+option label=obfs4 value=obfs4   disabled   obfs4/option
 option label=scramblesuit value=scramblesuitscramblesuit/option
 option label=fte   value=ftefteproxy/option
   /select



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py
index fa9c246..613e2db 100644
--- a/lib/bridgedb/Bridges.py
+++ b/lib/bridgedb/Bridges.py
@@ -548,7 +548,7 @@ class PluggableTransport(object):
 if includeFingerprint:
 sections.append(self.bridge.fingerprint)
 
-args = ,.join([%s=%s % (k, v) for k, v in self.argdict.items()])
+args =  .join([%s=%s % (k, v) for k, v in self.argdict.items()])
 sections.append(args)
 
 line = ' '.join(sections)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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|2 +-
 lib/bridgedb/Bridges.py |   26 ---
 lib/bridgedb/strings.py |1 +
 lib/bridgedb/templates/options.html |1 +
 lib/bridgedb/test/test_https.py |  133 +++
 setup.py|2 +-
 7 files changed, 155 insertions(+), 12 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 ++---
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/arm/graphing/bandwidth_stats.py b/arm/graphing/bandwidth_stats.py
index 80c105b..57dd047 100644
--- a/arm/graphing/bandwidth_stats.py
+++ b/arm/graphing/bandwidth_stats.py
@@ -220,18 +220,12 @@ class BandwidthStats(graph_panel.GraphStats):
 panel.addstr(labeling_line + 2, 12, 'Connection Closed...')
 
   def get_title(self, width):
-stats = list(self._title_stats)
+stats_label = str_tools.join(self._title_stats, ', ', width - 13)
 
-while True:
-  if not stats:
-return 'Bandwidth:'
-  else:
-label = 'Bandwidth (%s):' % ', '.join(stats)
-
-if len(label)  width:
-  del stats[-1]
-else:
-  return label
+if stats_label:
+  return 'Bandwidth (%s):' % stats_label
+else:
+  return 'Bandwidth:'
 
   def primary_header(self, width):
 return self.get_header_label(width, True)
@@ -253,19 +247,12 @@ class BandwidthStats(graph_panel.GraphStats):
 
 stats[0] = '%-14s' % ('%s/sec' % str_tools.size_label((self.last_primary 
if is_primary else self.last_secondary) * 1024, 1, False, 
CONFIG['features.graph.bw.transferInBytes']))
 
-# drops label's components if there's not enough space
-
-labeling = graph_type + ' (' + ''.join(stats).strip() + '):'
-
-while len(labeling) = width:
-  if len(stats)  1:
-del stats[-1]
-labeling = graph_type + ' (' + ''.join(stats).strip() + '):'
-  else:
-labeling = graph_type + ':'
-break
+stats_label = str_tools.join(stats, '', width - len(graph_type) - 4)
 
-return labeling
+if stats_label:
+  return '%s (%s):' % (graph_type, stats_label)
+else
+  return graph_type + ':'
 
   def get_color(self, is_primary):
 return DL_COLOR if is_primary else UL_COLOR



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 few parameters so it's not as stright forward as
'gimme the GETCONF BandwidthRate'.
---
 docs/change_log.rst |1 +
 stem/control.py |   42 +++
 test/unit/control/controller.py |   23 +
 3 files changed, 66 insertions(+)

diff --git a/docs/change_log.rst b/docs/change_log.rst
index c5867e4..7297cb9 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -43,6 +43,7 @@ The following are only available within Stem's `git repository
  * **Controller**
 
   * Added :func:`~stem.control.Controller.get_accounting_stats` to the 
:class:`~stem.control.Controller`
+  * Added :func:`~stem.control.Controller.get_effective_rate` to the 
:class:`~stem.control.Controller`
   * Added :func:`~stem.control.BaseController.connection_time` to the 
:class:`~stem.control.BaseController`
   * Changed :func:`~stem.control.Controller.get_microdescriptor`, 
:func:`~stem.control.Controller.get_server_descriptor`, and 
:func:`~stem.control.Controller.get_network_status` to get our own descriptor 
if no fingerprint or nickname is provided.
   * Added :class:`~stem.exit_policy.ExitPolicy` methods for more easily 
handling 'private' policies (the `default prefix 
https://www.torproject.org/docs/tor-manual.html.en#ExitPolicyRejectPrivate`_) 
and the defaultly appended suffix. This includes 
:func:`~stem.exit_policy.ExitPolicy.has_private`, 
:func:`~stem.exit_policy.ExitPolicy.strip_private`, 
:func:`~stem.exit_policy.ExitPolicy.has_default`, and 
:func:`~stem.exit_policy.ExitPolicy.strip_default` 
:class:`~stem.exit_policy.ExitPolicy` methods in addition to 
:func:`~stem.exit_policy.ExitPolicyRule.is_private` and 
:func:`~stem.exit_policy.ExitPolicyRule.is_default` for the 
:class:`~stem.exit_policy.ExitPolicyRule`. (:trac:`10107`)
diff --git a/stem/control.py b/stem/control.py
index 04098c0..4688bd7 100644
--- a/stem/control.py
+++ b/stem/control.py
@@ -122,6 +122,7 @@ If you're fine with allowing your script to raise 
exceptions then this can be mo
 |- signal - sends a signal to the tor client
 |- is_newnym_available - true if tor would presently accept a NEWNYM signal
 |- get_newnym_wait - seconds until tor would accept a NEWNYM signal
+|- get_effective_rate - provides our effective relaying rate limit
 |- is_geoip_unavailable - true if we've discovered our geoip db to be 
unavailable
 |- map_address - maps one address to another such that connections to the 
original are replaced with the other
 +- drop_guards - drops our set of guard relays and picks a new set
@@ -2666,6 +2667,47 @@ class Controller(BaseController):
 
 return max(0.0, self._last_newnym + 10 - time.time())
 
+  def get_effective_rate(self, default = UNDEFINED, burst = False):
+
+Provides the maximum rate this relay is configured to relay in bytes per
+second. This is based on multiple torrc parameters if they're set...
+
+* Effective Rate = min(BandwidthRate, RelayBandwidthRate, 
MaxAdvertisedBandwidth)
+* Effective Burst = min(BandwidthBurst, RelayBandwidthBurst)
+
+:param object default: response if the query fails
+:param bool burst: provides the burst bandwidth, otherwise this provides
+  the standard rate
+
+:returns: **int** with the effective bandwidth rate in bytes per second
+
+:raises: :class:`stem.ControllerError` if the call fails and no default was
+  provided
+
+
+if not burst:
+  attributes = ('BandwidthRate', 'RelayBandwidthRate', 
'MaxAdvertisedBandwidth')
+else:
+  attributes = ('BandwidthBurst', 'RelayBandwidthBurst')
+
+value = None
+
+for attr in attributes:
+  try:
+attr_value = int(self.get_conf(attr))
+
+if attr_value == 0 and attr.startswith('Relay'):
+  continue  # RelayBandwidthRate and RelayBandwidthBurst default to 
zero
+
+value = min(value, attr_value) if value else attr_value
+  except stem.ControllerError as exc:
+if default == UNDEFINED:
+  raise exc
+else:
+  return default
+
+return value
+
   def is_geoip_unavailable(self):
 
 Provides **True** if we've concluded hat our geoip database is unavailable,
diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py
index 7c7911e..948068f 100644
--- a/test/unit/control/controller.py
+++ b/test/unit/control/controller.py
@@ -588,6 +588,29 @@ class TestControl(unittest.TestCase):
 for test_input in malformed_inputs:
   self.assertRaises(ProtocolError, _parse_circ_path, test_input)
 
+  @patch('stem.control.Controller.get_conf')
+  def test_get_effective_rate(self, get_conf_mock):
+
+

[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 pretty odd handling for both the bandwidth total and average, 
properly
tracking the former but only basing the later on the time we've been 
running.

Proper behavior is...

  * Base the average on the whole duration tor's been running if we can get
both the bandwidth totals and tor's uptime.

  * If not then base both the total and average on the time arm's running.

This is not only more correct and intuitive, but leads to much simpler code
since we don't need to track the prepopulated values separately. Dropping a
couple helper functions while we're at it.
---
 arm/graphing/bandwidth_stats.py |  108 ++-
 1 file changed, 49 insertions(+), 59 deletions(-)

diff --git a/arm/graphing/bandwidth_stats.py b/arm/graphing/bandwidth_stats.py
index 57dd047..6fab22f 100644
--- a/arm/graphing/bandwidth_stats.py
+++ b/arm/graphing/bandwidth_stats.py
@@ -12,7 +12,7 @@ from arm.graphing import graph_panel
 from arm.util import bandwidth_from_state, tor_controller
 
 from stem.control import State
-from stem.util import conf, str_tools
+from stem.util import conf, str_tools, system
 
 
 def conf_handler(key, value):
@@ -44,12 +44,6 @@ class BandwidthStats(graph_panel.GraphStats):
   def __init__(self, is_pause_buffer = False):
 graph_panel.GraphStats.__init__(self)
 
-# stats prepopulated from tor's state file
-
-self.prepopulate_primary_total = 0
-self.prepopulate_secondary_total = 0
-self.prepopulate_ticks = 0
-
 self.accounting_stats = None
 
 # listens for tor reload (sighup) events which can reset the bandwidth
@@ -63,25 +57,22 @@ class BandwidthStats(graph_panel.GraphStats):
 
 controller.add_status_listener(self.reset_listener)
 
-# Initialized the bandwidth totals to the values reported by Tor. This
-# uses a controller options introduced in ticket 2345:
-# https://trac.torproject.org/projects/tor/ticket/2345
+# We both show our 'total' attributes and use it to determine our average.
 #
-# further updates are still handled via BW events to avoid unnecessary
-# GETINFO requests.
-
-self.initial_primary_total = 0
-self.initial_secondary_total = 0
+# If we can get *both* our start time and the totals from tor (via 'GETINFO
+# traffic/*') then that's ideal, but if not then just track the total for
+# the time arm is run.
 
 read_total = controller.get_info('traffic/read', None)
-
-if read_total and read_total.isdigit():
-  self.initial_primary_total = int(read_total) / 1024  # Bytes - KB
-
 write_total = controller.get_info('traffic/written', None)
+start_time = system.start_time(controller.get_pid(None))
 
-if write_total and write_total.isdigit():
-  self.initial_secondary_total = int(write_total) / 1024  # Bytes - KB
+if read_total and write_total and start_time:
+  self.primary_total = int(read_total) / 1024  # Bytes - KB
+  self.secondary_total = int(write_total) / 1024  # Bytes - KB
+  self.start_time = start_time
+else:
+  self.start_time = time.time()
 
   def clone(self, new_copy = None):
 if not new_copy:
@@ -157,10 +148,6 @@ class BandwidthStats(graph_panel.GraphStats):
 
   self.last_primary, self.last_secondary = read_value, write_value
 
-  self.prepopulate_primary_total += read_value * 900
-  self.prepopulate_secondary_total += write_value * 900
-  self.prepopulate_ticks += 900
-
   self.primary_counts[interval_index].insert(0, read_value)
   self.secondary_counts[interval_index].insert(0, write_value)
 
@@ -194,8 +181,13 @@ class BandwidthStats(graph_panel.GraphStats):
   panel.addstr(labeling_line, 0, ' ' * width)
   graph_column = min((width - 10) / 2, self.max_column)
 
-  primary_footer = '%s, %s' % (self._get_avg_label(True), 
self._get_total_label(True))
-  secondary_footer = '%s, %s' % (self._get_avg_label(False), 
self._get_total_label(False))
+  primary_total = 'total: %s' % _size_label(self.primary_total * 1024)
+  primary_average = 'avg: %s/sec' % _size_label(self.primary_total / 
(time.time() - self.start_time) * 1024)
+  primary_footer = '%s, %s' % (primary_average, primary_total)
+
+  secondary_total = 'total: %s' % _size_label(self.secondary_total * 1024)
+  secondary_average = 'avg: %s/sec' % _size_label(self.primary_total / 
(time.time() - self.start_time) * 1024)
+  secondary_footer = '%s, %s' % (secondary_average, secondary_total)
 
   panel.addstr(labeling_line, 1, primary_footer, self.get_color(True))
   panel.addstr(labeling_line, graph_column + 6, secondary_footer, 
self.get_color(False))
@@

[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 ++-
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/arm/graphing/bandwidth_stats.py b/arm/graphing/bandwidth_stats.py
index 6fab22f..bc61bb6 100644
--- a/arm/graphing/bandwidth_stats.py
+++ b/arm/graphing/bandwidth_stats.py
@@ -272,14 +272,8 @@ class BandwidthStats(graph_panel.GraphStats):
 
 if not self._title_stats or not my_fingerprint or (event and 
my_fingerprint in event.idlist):
   stats = []
-  bw_rate = _min_config(controller, 'BandwidthRate', 'RelayBandwidthRate', 
'MaxAdvertisedBandwidth')
-  bw_burst = _min_config(controller, 'BandwidthBurst', 
'RelayBandwidthBurst')
-
-  my_server_descriptor = controller.get_server_descriptor(default = None)
-  bw_observed = getattr(my_server_descriptor, 'observed_bandwidth', None)
-
-  my_router_status_entry = controller.get_network_status(default = None)
-  bw_measured = getattr(my_router_status_entry, 'bandwidth', None)
+  bw_rate = controller.get_effective_rate(None)
+  bw_burst = controller.get_effective_rate(None, burst = True)
 
   if bw_rate and bw_burst:
 bw_rate_label = _size_label(bw_rate)
@@ -288,8 +282,8 @@ class BandwidthStats(graph_panel.GraphStats):
 # if both are using rounded values then strip off the '.0' decimal
 
 if '.0' in bw_rate_label and '.0' in bw_burst_label:
-  bw_rate_label = bw_rate_label.replace('.0', '')
-  bw_burst_label = bw_burst_label.replace('.0', '')
+  bw_rate_label = bw_rate_label.split('.', 1)[0]
+  bw_burst_label = bw_burst_label.split('.', 1)[0]
 
 stats.append('limit: %s/s' % bw_rate_label)
 stats.append('burst: %s/s' % bw_burst_label)
@@ -298,6 +292,12 @@ class BandwidthStats(graph_panel.GraphStats):
   # available or if the measured bandwidth is the observed (this happens
   # if there isn't yet enough bandwidth measurements).
 
+  my_server_descriptor = controller.get_server_descriptor(default = None)
+  bw_observed = getattr(my_server_descriptor, 'observed_bandwidth', None)
+
+  my_router_status_entry = controller.get_network_status(default = None)
+  bw_measured = getattr(my_router_status_entry, 'bandwidth', None)
+
   if bw_observed and (not bw_measured or bw_measured == bw_observed):
 stats.append('observed: %s/s' % _size_label(bw_observed))
   elif bw_measured:
@@ -306,27 +306,5 @@ class BandwidthStats(graph_panel.GraphStats):
   self._title_stats = stats
 
 
-def _min_config(controller, *attributes):
-  
-  Provides the minimum of the given numeric bandwidth rate or burst config
-  options.
-  
-
-  value = None
-
-  for attr in attributes:
-try:
-  attr_value = int(controller.get_conf(attr))
-
-  if attr_value == 0 and attr.startswith('Relay'):
-continue  # RelayBandwidthRate and RelayBandwidthBurst default to zero
-
-  value = min(value, attr_value) if value else attr_value
-except:
-  pass
-
-  return value
-
-
 def _size_label(byte_count):
   return str_tools.size_label(byte_count, 1, is_bytes = 
CONFIG['features.graph.bw.transferInBytes'])



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[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 that didn't exist, didn't 
properly
initialize attributes, no reason in including observed bandwidth if 
measured is
available).
---
 arm/graphing/bandwidth_stats.py |   60 +--
 1 file changed, 26 insertions(+), 34 deletions(-)

diff --git a/arm/graphing/bandwidth_stats.py b/arm/graphing/bandwidth_stats.py
index bc61bb6..0dffde2 100644
--- a/arm/graphing/bandwidth_stats.py
+++ b/arm/graphing/bandwidth_stats.py
@@ -44,18 +44,18 @@ class BandwidthStats(graph_panel.GraphStats):
   def __init__(self, is_pause_buffer = False):
 graph_panel.GraphStats.__init__(self)
 
-self.accounting_stats = None
-
 # listens for tor reload (sighup) events which can reset the bandwidth
 # rate/burst and if tor's using accounting
 
 controller = tor_controller()
 self._title_stats = []
+self._accounting_stats = None
 
 if not is_pause_buffer:
   self.reset_listener(controller, State.INIT, None)  # initializes values
 
 controller.add_status_listener(self.reset_listener)
+self.new_desc_event(None)  # updates title params
 
 # We both show our 'total' attributes and use it to determine our average.
 #
@@ -78,10 +78,7 @@ class BandwidthStats(graph_panel.GraphStats):
 if not new_copy:
   new_copy = BandwidthStats(True)
 
-new_copy.accounting_stats = self.accounting_stats
-
-# attributes that would have been initialized from calling the 
reset_listener
-
+new_copy._accounting_stats = self._accounting_stats
 new_copy._title_stats = self._title_stats
 
 return graph_panel.GraphStats.clone(self, new_copy)
@@ -89,14 +86,13 @@ class BandwidthStats(graph_panel.GraphStats):
   def reset_listener(self, controller, event_type, _):
 # updates title parameters and accounting status if they changed
 
-self._title_stats = [] # force reset of title
 self.new_desc_event(None)  # updates title params
 
 if event_type in (State.INIT, State.RESET) and 
CONFIG['features.graph.bw.accounting.show']:
   is_accounting_enabled = controller.get_info('accounting/enabled', None) 
== '1'
 
-  if is_accounting_enabled != bool(self.accounting_stats):
-self.accounting_stats = tor_controller().get_accounting_stats(None)
+  if is_accounting_enabled != bool(self._accounting_stats):
+self._accounting_stats = tor_controller().get_accounting_stats(None)
 
 # redraws the whole screen since our height changed
 
@@ -160,9 +156,9 @@ class BandwidthStats(graph_panel.GraphStats):
 return time.time() - min(stats.last_read_time, stats.last_write_time)
 
   def bandwidth_event(self, event):
-if self.accounting_stats and self.is_next_tick_redraw():
-  if time.time() - self.accounting_stats.retrieved = 
CONFIG['features.graph.bw.accounting.rate']:
-self.accounting_stats = tor_controller().get_accounting_stats(None)
+if self._accounting_stats and self.is_next_tick_redraw():
+  if time.time() - self._accounting_stats.retrieved = 
CONFIG['features.graph.bw.accounting.rate']:
+self._accounting_stats = tor_controller().get_accounting_stats(None)
 
 # scales units from B to KB for graphing
 
@@ -194,19 +190,19 @@ class BandwidthStats(graph_panel.GraphStats):
 
 # provides accounting stats if enabled
 
-if self.accounting_stats:
+if self._accounting_stats:
   if tor_controller().is_alive():
-hibernate_color = 
CONFIG['attr.hibernate_color'].get(self.accounting_stats.status, 'red')
+hibernate_color = 
CONFIG['attr.hibernate_color'].get(self._accounting_stats.status, 'red')
 
 x, y = 0, labeling_line + 2
 x = panel.addstr(y, x, 'Accounting (', curses.A_BOLD)
-x = panel.addstr(y, x, self.accounting_stats.status, curses.A_BOLD, 
hibernate_color)
+x = panel.addstr(y, x, self._accounting_stats.status, curses.A_BOLD, 
hibernate_color)
 x = panel.addstr(y, x, ')', curses.A_BOLD)
 
-panel.addstr(y, 35, 'Time to reset: %s' % 
str_tools.short_time_label(self.accounting_stats.time_until_reset))
+panel.addstr(y, 35, 'Time to reset: %s' % 
str_tools.short_time_label(self._accounting_stats.time_until_reset))
 
-panel.addstr(y + 1, 2, '%s / %s' % (self.accounting_stats.read_bytes, 
self.accounting_stats.read_limit), self.get_color(True))
-panel.addstr(y + 1, 37, '%s / %s' % 
(self.accounting_stats.written_bytes, self.accounting_stats.write_limit), 
self.get_color(True))
+panel.addstr(y + 1, 2, '%s / %s' % (self._accounting_stats.read_bytes, 
self._accounting_stats.read_limit), self.get_color(True))
+panel.addstr(y + 1, 37, '%s / %s' % 
(self._accounting_stats.written_bytes,

46 matches

Mail list logo