[tor-commits] [translation/torbirdy] Update translations for torbirdy
commit 32e7403d7d5f90fbb37d2fefda7c35a268580bc0 Author: Translation commit bot Date: Mon Aug 18 20:15:33 2014 + Update translations for torbirdy --- nn/torbirdy.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nn/torbirdy.properties b/nn/torbirdy.properties index 8a81121..644933e 100644 --- a/nn/torbirdy.properties +++ b/nn/torbirdy.properties @@ -7,7 +7,7 @@ torbirdy.enabled.torification=TorBirdy er på: Gjennomsiktig Torification torbirdy.enabled.whonix=TorBirdy på:Whonix torbirdy.disabled=TorBirdy: av! -torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually. +torbirdy.email.prompt=TorBirdy har slått av rettleiaren for auto-oppsett i Thunderbird for å verna anonymiteten din.\n\nTilrådde tryggingsinnstillingar for for %S er valde.\n\nDu kan no setja opp dei andre kontoinnstillingane manuelt. torbirdy.email.advanced=Merk at endringar av avanserte innstillingar i TorBirdy er IKKJE tilrådd.\n\nDu skal berre halda fram om du er viss på kva du gjer. torbirdy.email.advanced.nextwarning=Vis denne åtvaringa neste gong ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [chutney/master] Remove some unused variables
commit db1397754ed3c591462cbdb4bfa5b7199541867b
Author: Daniel MartÃ
Date: Fri Aug 15 14:39:53 2014 +0200
Remove some unused variables
Signed-off-by: Daniel MartÃ
---
lib/chutney/TorNet.py |5 ++---
lib/chutney/Traffic.py |1 -
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 3685ec0..9d8efd1 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -297,7 +297,6 @@ class LocalNodeBuilder(NodeBuilder):
"""
datadir = self._env['dir']
tor = self._env['tor']
-idfile = os.path.join(datadir,'keys',"identity_key")
cmdline = [
tor,
"--quiet",
@@ -445,9 +444,9 @@ class LocalNodeController(NodeController):
def hup(self):
"""Send a SIGHUP to this node, if it's running."""
pid = self.getPid()
-running = self.isRunning()
+running = self.isRunning(pid)
nick = self._env['nick']
-if self.isRunning():
+if running:
print "Sending sighup to %s"%nick
os.kill(pid, signal.SIGHUP)
return True
diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py
index 7202c3d..57250f7 100644
--- a/lib/chutney/Traffic.py
+++ b/lib/chutney/Traffic.py
@@ -312,7 +312,6 @@ import sys
def main():
"""Test the TrafficTester by sending and receiving some data."""
DATA = "a foo is a bar" * 1000
-DATA_CORRUPT = "a foo is a baz" * 1000
proxy = ('localhost', 9008)
bind_to = ('localhost', int(sys.argv[1]))
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbirdy] Update translations for torbirdy
commit 2db8f987195ac9c10a46c6ab25c9850282eb0b42 Author: Translation commit bot Date: Mon Aug 18 19:45:30 2014 + Update translations for torbirdy --- nn/torbirdy.properties | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/nn/torbirdy.properties b/nn/torbirdy.properties index b999de2..8a81121 100644 --- a/nn/torbirdy.properties +++ b/nn/torbirdy.properties @@ -1,19 +1,19 @@ -# torbirdy.name=TorBirdy +torbirdy.name=TorBirdy -# torbirdy.enabled.tor=TorBirdy Enabled:Tor -# torbirdy.enabled.jondo=TorBirdy Enabled:JonDo -# torbirdy.enabled.custom=TorBirdy Enabled:Custom Proxy -# torbirdy.enabled.torification=TorBirdy Enabled:Transparent Torification -# torbirdy.enabled.whonix=TorBirdy Enabled:Whonix -# torbirdy.disabled=TorBirdy:Disabled! +torbirdy.enabled.tor=TorBirdy er på:Tor +torbirdy.enabled.jondo=TorBirdy er på:JonDo +torbirdy.enabled.custom=TorBirdy er på: Eigendefinert Proxy +torbirdy.enabled.torification=TorBirdy er på: Gjennomsiktig Torification +torbirdy.enabled.whonix=TorBirdy på:Whonix +torbirdy.disabled=TorBirdy: av! -# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually. +torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually. -# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. -# torbirdy.email.advanced.nextwarning=Show this warning next time -# torbirdy.email.advanced.title=TorBirdy Advanced Settings +torbirdy.email.advanced=Merk at endringar av avanserte innstillingar i TorBirdy er IKKJE tilrådd.\n\nDu skal berre halda fram om du er viss på kva du gjer. +torbirdy.email.advanced.nextwarning=Vis denne åtvaringa neste gong +torbirdy.email.advanced.title=TorBirdy avanserte innstillingar -# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect. +torbirdy.restart=Du må starta Thunderbird på nytt for at tidssoneinnstillingane skal visast. -# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. -# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy +torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-perl5lib] Update translations for tails-perl5lib
commit fb3d0760d7c600c532cd64f865cc469df5386cb6 Author: Translation commit bot Date: Mon Aug 18 19:45:56 2014 + Update translations for tails-perl5lib --- nn.po | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nn.po b/nn.po index d67714a..b922e0b 100644 --- a/nn.po +++ b/nn.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bjørn I. , 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" -"POT-Creation-Date: 2013-11-28 11:56+0100\n" -"PO-Revision-Date: 2013-12-30 04:38+\n" -"Last-Translator: Phoul \n" +"POT-Creation-Date: 2014-06-24 11:37+0200\n" +"PO-Revision-Date: 2014-08-18 19:31+\n" +"Last-Translator: Bjørn I. \n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,8 +18,8 @@ msgstr "" "Language: nn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../lib/Tails/RunningSystem.pm:139 +#: ../lib/Tails/RunningSystem.pm:153 msgid "" "The device Tails is running from cannot be found. Maybe you used the `toram'" " option?" -msgstr "" +msgstr "Klarte ikkje å finna eininga som Tails køyrer frå. Kanskje du nytta `toram' ved oppstart?" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-greeter] Update translations for tails-greeter
commit 3e7a33c6cea3cb49a86d391ff6f91eb1b696f86b Author: Translation commit bot Date: Mon Aug 18 19:45:25 2014 + Update translations for tails-greeter --- nn/nn.po | 45 +++-- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/nn/nn.po b/nn/nn.po index e1abca0..c8e5e61 100644 --- a/nn/nn.po +++ b/nn/nn.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bjørn I. , 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-20 18:36+0200\n" -"PO-Revision-Date: 2014-08-13 13:20+\n" -"Last-Translator: runasand \n" +"PO-Revision-Date: 2014-08-18 19:40+\n" +"Last-Translator: Bjørn I. \n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,23 +20,23 @@ msgstr "" #: ../glade/persistencewindow.glade.h:1 msgid "Forward" -msgstr "" +msgstr "Fram" #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1 msgid "Login" -msgstr "" +msgstr "Innlogging" #: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2 msgid "Welcome to Tails" -msgstr "" +msgstr "Velkomen til Tails" #: ../glade/persistencewindow.glade.h:4 msgid "Use persistence?" -msgstr "" +msgstr "Bruka vedvarande lagring?" #: ../glade/persistencewindow.glade.h:5 msgid "Documentation" -msgstr "" +msgstr "Dokumentasjon" #: ../glade/persistencewindow.glade.h:6 msgid "Yes" @@ -47,29 +48,29 @@ msgstr "Nei" #: ../glade/persistencewindow.glade.h:8 msgid "Passphrase:" -msgstr "" +msgstr "Passord:" #: ../glade/persistencewindow.glade.h:9 msgid "Read-Only?" -msgstr "" +msgstr "Skriveverna?" #: ../glade/persistencewindow.glade.h:10 msgid "Wrong passphrase. Please try again." -msgstr "" +msgstr "Feil passord. Prøv igjen." #: ../glade/persistencewindow.glade.h:11 msgid "More options?" -msgstr "" +msgstr "Fleire val?" #: ../glade/optionswindow.glade.h:3 msgid "Administration password" -msgstr "" +msgstr "Administrasjonspassord" #: ../glade/optionswindow.glade.h:4 msgid "" "Documentation" -msgstr "" +msgstr "Dokumentasjon" #: ../glade/optionswindow.glade.h:5 msgid "" @@ -79,25 +80,25 @@ msgstr "" #: ../glade/optionswindow.glade.h:7 msgid "Password:" -msgstr "" +msgstr "Passord:" #: ../glade/optionswindow.glade.h:8 msgid "Verify Password:" -msgstr "" +msgstr "Stadfest passord:" #: ../glade/optionswindow.glade.h:9 msgid "Passwords do not match" -msgstr "" +msgstr "Passorda samsvarar ikkje" #: ../glade/optionswindow.glade.h:10 msgid "Windows camouflage" -msgstr "" +msgstr "Windows-kamuflasje" #: ../glade/optionswindow.glade.h:11 msgid "" "Documentation" -msgstr "" +msgstr "Dokumentasjon" #: ../glade/optionswindow.glade.h:12 msgid "" @@ -107,7 +108,7 @@ msgstr "" #: ../glade/optionswindow.glade.h:13 msgid "Activate Microsoft Windows 8 Camouflage" -msgstr "" +msgstr "SlÃ¥ pÃ¥ Microsoft Windows 8 kamuflasje" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing" @@ -163,7 +164,7 @@ msgstr "" #: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43 msgid "Language" -msgstr "" +msgstr "SprÃ¥k" #: ../glade/langpanel.glade.h:3 msgid "Locale" @@ -171,7 +172,7 @@ msgstr "" #: ../glade/langpanel.glade.h:4 msgid "Layout" -msgstr "" +msgstr "Utforming" #: ../tailsgreeter/persistence.py:59 #, python-format @@ -199,4 +200,4 @@ msgstr "" #: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 #: ../tailsgreeter/langpanel.py:183 msgid "Other..." -msgstr "" +msgstr "Anna â¦" ___ 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
commit d3679291ae082e617d670322fa186fd3db07 Author: Translation commit bot Date: Mon Aug 18 19:45:39 2014 + Update translations for tor-launcher-network-settings --- nn/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nn/network-settings.dtd b/nn/network-settings.dtd index c810b5e..dd764e4 100644 --- a/nn/network-settings.dtd +++ b/nn/network-settings.dtd @@ -39,7 +39,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
commit afbb694192455f5fab63e730b27c81b9ea0c9c4b Author: Translation commit bot Date: Mon Aug 18 19:45:58 2014 + Update translations for tails-perl5lib_completed --- nn.po | 25 + 1 file changed, 25 insertions(+) diff --git a/nn.po b/nn.po new file mode 100644 index 000..b922e0b --- /dev/null +++ b/nn.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Bjørn I. , 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: Tails developers \n" +"POT-Creation-Date: 2014-06-24 11:37+0200\n" +"PO-Revision-Date: 2014-08-18 19:31+\n" +"Last-Translator: Bjørn I. \n" +"Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nn\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../lib/Tails/RunningSystem.pm:153 +msgid "" +"The device Tails is running from cannot be found. Maybe you used the `toram'" +" option?" +msgstr "Klarte ikkje å finna eininga som Tails køyrer frå. Kanskje du nytta `toram' ved oppstart?" ___ 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
commit 594461532372409d0c83a402aa72d5dabf5e4f18 Author: Translation commit bot Date: Mon Aug 18 19:45:22 2014 + Update translations for tails-persistence-setup --- nn/nn.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nn/nn.po b/nn/nn.po index 00099d3..b54b64f 100644 --- a/nn/nn.po +++ b/nn/nn.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers \n" "POT-Creation-Date: 2014-07-01 22:15+0200\n" -"PO-Revision-Date: 2014-08-02 10:40+\n" +"PO-Revision-Date: 2014-08-18 19:40+\n" "Last-Translator: Bjørn I. \n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" "MIME-Version: 1.0\n" @@ -216,7 +216,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 msgid "Passphrase:" -msgstr "" +msgstr "Passord:" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 msgid "Verify Passphrase:" ___ 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
commit c3c42c71da247f342cbb2a9ca6f29fd4d3b3a344 Author: Translation commit bot Date: Mon Aug 18 19:45:03 2014 + Update translations for bridgedb --- nn/LC_MESSAGES/bridgedb.po | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nn/LC_MESSAGES/bridgedb.po b/nn/LC_MESSAGES/bridgedb.po index 4c1b420..f563d78 100644 --- a/nn/LC_MESSAGES/bridgedb.po +++ b/nn/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2014-07-26 02:11+\n" -"PO-Revision-Date: 2014-08-13 18:10+\n" +"PO-Revision-Date: 2014-08-18 19:30+\n" "Last-Translator: Bjørn I. \n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" "MIME-Version: 1.0\n" @@ -152,7 +152,7 @@ msgstr "Brua mi verkar ikkje! Eg treng hjelp!" #: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "" +msgstr "Om Tor ikkje fungerer, skriv ein e-post til %s." #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". @@ -166,7 +166,7 @@ msgstr "" #: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" -msgstr "" +msgstr "Her er bru-linene dine:" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" @@ -187,11 +187,11 @@ msgstr "Treng du %s?" #: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." -msgstr "" +msgstr "Nettlesaren din viser ikkje bilete skikeleg." #: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." -msgstr "" +msgstr "Skriv inn teikn frå biletet nedanfor " #: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" @@ -230,18 +230,18 @@ msgstr "" #: lib/bridgedb/strings.py:141 msgid "Displays this message." -msgstr "" +msgstr "Viser denne meldinga." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. #: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." -msgstr "" +msgstr "Be om bruer med fabrikkoppsett." #: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." -msgstr "" +msgstr "Be om IPv6-bruer." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: lib/bridgedb/strings.py:148 @@ -280,7 +280,7 @@ msgstr "" #: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." -msgstr "" +msgstr "Ingen bruer er for tida tilgjengelege " #: lib/bridgedb/templates/bridges.html:73 #, python-format ___ 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_completed] Update translations for tor-launcher-properties_completed
commit 94e994a42123d9053d7bb899040867c108f34aea Author: Translation commit bot Date: Mon Aug 18 18:45:33 2014 + Update translations for tor-launcher-properties_completed --- ja/torlauncher.properties |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ja/torlauncher.properties b/ja/torlauncher.properties index ad50a92..1142f71 100644 --- a/ja/torlauncher.properties +++ b/ja/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited=Torã¯äºæããçµäºãã¾ããã -torlauncher.please_restart_app=ãã®ã¢ããªã±ã¼ã·ã§ã³ãåèµ·åãã¦ãã ããã +torlauncher.tor_exited=Torãçªç¶çµäºãã¾ãããåå ã¯ããããTorèªä½ã®ãã°ããä»ã®å¸¸é§ããã°ã©ã ãããããã¯ãã¼ãã¦ã§ã¢ã¼ãåé¡ã§ããTorãåèµ·åããã¾ã§ãTorãã©ã¦ã¶ã¼ã¯ã¦ã§ããµã¤ãã«ä¸åæ¥ç¶ã§ãã¾ãããåèµ·åãã¦ã解決ãããªãå ´åãTorãã°ãã¡ã¤ã«ããµãã¼ããã¼ã ã«éä¿¡ãã¦ãã ãã +torlauncher.tor_exited2=Torãåèµ·åãã¦ããããªãã®ãã©ã¦ã¶ã¼ã¿ãã¯ãã®ã¾ã¾æ®ãã¾ãã torlauncher.tor_controlconn_failed=Torã®ã³ã³ããã¼ã«ãã¼ãã«æ¥ç¶åºæ¥ã¾ããã§ããã torlauncher.tor_failed_to_start=Torã¯éå§åºæ¥ã¾ããã§ããã torlauncher.tor_control_failed=Tor ã®å¶å¾¡ã«å¤±æãã¾ããã @@ -30,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=ãã©ã³ã¹ãã¼ãã¿ã¤ã %S ã torlauncher.recommended_bridge=(æ¨å¥¨) torlauncher.connect=æ¥ç¶ +torlauncher.restart_tor=Torãåèµ·åãã torlauncher.quit=çµäº torlauncher.quit_win=çµäº torlauncher.done=å®äº ___ 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
commit 9658ec05ec08ffc2ccc67b6f18bebe5525760027 Author: Translation commit bot Date: Mon Aug 18 18:45:29 2014 + Update translations for tor-launcher-properties --- ja/torlauncher.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/torlauncher.properties b/ja/torlauncher.properties index d0c488b..1142f71 100644 --- a/ja/torlauncher.properties +++ b/ja/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited=Torãçªç¶çµäºãã¾ãããåå ã¯ããããTorèªä½ã®ãã°ããä»ã®å¸¸é§ããã°ã©ã ãããããã¯ãã¼ãã¦ã§ã¢ã¼ãåé¡ã§ããTorãåèµ·åããã¾ã§ãTorãã©ã¦ã¶ã¼ã¯ã¦ã§ããµã¤ãã«ä¸åæ¥ç¶ã§ãã¾ãããåèµ·åãã¦ã解決ãããªãå ´åãTorãã°ãã¡ã¤ã«ããµãã¼ããã¼ã ã«éä¿¡ãã¦ãã ãã torlauncher.tor_exited2=Torãåèµ·åãã¦ããããªãã®ãã©ã¦ã¶ã¼ã¿ãã¯ãã®ã¾ã¾æ®ãã¾ãã torlauncher.tor_controlconn_failed=Torã®ã³ã³ããã¼ã«ãã¼ãã«æ¥ç¶åºæ¥ã¾ããã§ããã torlauncher.tor_failed_to_start=Torã¯éå§åºæ¥ã¾ããã§ããã ___ 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
commit 1ffa1cf2f418bb5758db2789eb7bf9650a9b2c77 Author: Translation commit bot Date: Mon Aug 18 18:15:40 2014 + Update translations for tor-launcher-network-settings_completed --- ja/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/network-settings.dtd b/ja/network-settings.dtd index 4fe84c4..ff7c188 100644 --- a/ja/network-settings.dtd +++ b/ja/network-settings.dtd @@ -29,7 +29,7 @@ - + ___ 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
commit 2b2616dd8edd88472f110f114843f726ada5b088 Author: Translation commit bot Date: Mon Aug 18 18:15:30 2014 + Update translations for tor-launcher-properties --- ja/torlauncher.properties |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ja/torlauncher.properties b/ja/torlauncher.properties index 1535df0..d0c488b 100644 --- a/ja/torlauncher.properties +++ b/ja/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited2=Torãåèµ·åãã¦ããããªãã®ãã©ã¦ã¶ã¼ã¿ãã¯ãã®ã¾ã¾æ®ãã¾ãã torlauncher.tor_controlconn_failed=Torã®ã³ã³ããã¼ã«ãã¼ãã«æ¥ç¶åºæ¥ã¾ããã§ããã torlauncher.tor_failed_to_start=Torã¯éå§åºæ¥ã¾ããã§ããã torlauncher.tor_control_failed=Tor ã®å¶å¾¡ã«å¤±æãã¾ããã @@ -30,7 +30,7 @@ torlauncher.error_bridge_bad_default_type=ãã©ã³ã¹ãã¼ãã¿ã¤ã %S ã torlauncher.recommended_bridge=(æ¨å¥¨) torlauncher.connect=æ¥ç¶ -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=Torãåèµ·åãã torlauncher.quit=çµäº torlauncher.quit_win=çµäº torlauncher.done=å®äº ___ 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
commit af10b2ef1be870706e989dad8a2298d901c9d46f Author: Translation commit bot Date: Mon Aug 18 18:15:38 2014 + Update translations for tor-launcher-network-settings --- ja/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/network-settings.dtd b/ja/network-settings.dtd index 7d10085..ff7c188 100644 --- a/ja/network-settings.dtd +++ b/ja/network-settings.dtd @@ -29,7 +29,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torspec/master] Add proposal 237: All relays are directory servers by Matthew Finkel
commit 38e1ccdecac69be6651fc6d0ffb0b7c0f68ae3ed Author: Nick Mathewson Date: Mon Aug 18 14:05:25 2014 -0400 Add proposal 237: All relays are directory servers by Matthew Finkel --- proposals/000-index.txt |2 + proposals/237-directory-servers-for-all.txt | 131 +++ 2 files changed, 133 insertions(+) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 4674c3f..8ac1aa6 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -157,6 +157,7 @@ Proposals by number: 234 Adding remittance field to directory specification [OPEN] 235 Stop assigning (and eventually supporting) the Named flag [DRAFT] 236 The move to a single guard node [OPEN] +237 All relays are directory servers [OPEN] Proposals by status: @@ -216,6 +217,7 @@ Proposals by status: 233 Making Tor2Web mode faster 234 Adding remittance field to directory specification 236 The move to a single guard node + 237 All relays are directory servers [for 0.2.6.x] ACCEPTED: 140 Provide diffs between consensuses 172 GETINFO controller option for circuit information diff --git a/proposals/237-directory-servers-for-all.txt b/proposals/237-directory-servers-for-all.txt new file mode 100644 index 000..bc5aad2 --- /dev/null +++ b/proposals/237-directory-servers-for-all.txt @@ -0,0 +1,131 @@ +Filename: 237-directory-servers-for-all.txt +Title: All relays are directory servers +Author: Matthew Finkel +Created: 29-Jul-2014 +Status: Open +Target: 0.2.6.x + +Overview: + + This proposal aims at removing part of the distinction between the + relay and the directory server. Currently operators have the options + of being one of: a relay, a directory server, or both. With the + acceptance of this proposal the options will be simplified to being + either only a directory server or a combined relay and directory + server. All relays will serve directory requests. + +Motivation: + + Fetching directory documents and descriptors is sometimes a + non-trivial operation for clients. If they do not have a consensus then + they must contact a directory authority (until directory sources are + added or clients are able to use a fallback consensus). If they have a + consensus and have at least one entry guard then the client can query + that guard for documents. If the document isn't available then after a + period of time the client will attempt to retry downloading it. If the + entry guard isn't a directory server, as well, a directory server and/or + directory guard must be chosen (based on the server having an open + DirPort) and queried for the document. At a minimum, this has a + potential performance impact, at worst it's another attack vector that + allows for profiling clients and partitioning users. With the + orthogonally proposed move to clients using a single guard, the + potential performance bottleneck and ability to profile users could be + exacerbated. If the client selects an entry guard and it is not a + directory server then the client may select a distinct directory guard + which will leak client behavior to a second node. In the case where the + client does not use guards, it is important to have the largest possible + amount of diversity in the set of directory servers. In a network where + every relay is a directory server, the profiling and partitioning + attack vector is reduced to the guard (for clients who use them), which + is already in a privileged position for this. In addition, with the + increased set size relay descriptors and documents are more readily + available and it diversifies the providers. + + +Design: + + The changes needed to achieve this should be simple. Currently all + relays download and cache the majority of relay documents in any case, + so the slight increased memory usage from downloading all of them should + have minimal consequences. There will be necessary logical changes in + the client, router, and directory code. + + Currently directory servers are defined as such if they advertise + having an open directory port. We can no longer assume this is true. To + this end, we will introduce a new server descriptor line. + + "tunnelled-dir-server" NL + + The presence of this line indicates that the relay accepts + tunnelled directory requests. For a relay that implements this + proposal, this line MUST be added to its descriptor if it does not + advertise a directory port, and MAY be added if it also advertises an + open directory port. In addition to this, relays will now download and + cache all descriptors and documents listed in the consensus, regardless + of whether they are deemed useful or usable, exactly like the current + directory servers. All relays will also accept directory requests when + they are tunnelled over a connection established with a BEGIN_DIR cell, + the same way these connections are already accepted by b
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit a1149020174b501e6ae0c461acfadaea776b9489 Author: Translation commit bot Date: Mon Aug 18 17:15:03 2014 + Update translations for bridgedb --- es/LC_MESSAGES/bridgedb.po |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po index 3211720..493d1d0 100644 --- a/es/LC_MESSAGES/bridgedb.po +++ b/es/LC_MESSAGES/bridgedb.po @@ -4,6 +4,7 @@ # # Translators: # dark_yoshi , 2014 +# toypurina , 2014 # NinjaTuna , 2011 # Noel Torres , 2013 # Paola Falcon , 2014 @@ -15,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2014-07-26 02:11+\n" -"PO-Revision-Date: 2014-07-27 07:01+\n" -"Last-Translator: Jonis \n" +"PO-Revision-Date: 2014-08-18 17:10+\n" +"Last-Translator: toypurina \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,7 +39,7 @@ msgstr "" #. "Tor Browser" #: lib/bridgedb/HTTPServer.py:121 msgid "Sorry! Something went wrong with your request." -msgstr "¡Lo sentimos! Algo estuvo mal con su solicitud." +msgstr "¡Lo sentimos! Algo ha salido mal con su solicitud. " #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]" ___ 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
commit 2debfe41ed5db9663ca09899334ce63831a94592 Author: Translation commit bot Date: Mon Aug 18 17:15:16 2014 + Update translations for torcheck_completed --- es/torcheck.po |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/es/torcheck.po b/es/torcheck.po index 1e41f85..de12063 100644 --- a/es/torcheck.po +++ b/es/torcheck.po @@ -3,6 +3,7 @@ # # Translators: # Alexi Ulacio , 2014 +# toypurina , 2014 # her_tor_es_ar , 2014 # Dani_RU , 2014 # gaspa , 2014 @@ -19,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-07-27 07:01+\n" -"Last-Translator: Jonis \n" +"PO-Revision-Date: 2014-08-18 17:10+\n" +"Last-Translator: toypurina \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,7 +45,7 @@ msgstr "Hay una actualización de seguridad disponible para el Paquete de Navega msgid "" "https://www.torproject.org/download/download-easy.html\";>Click " "here to go to the download page" -msgstr "https://www.torproject.org/download/download-easy.html\";>Haga click aqui para ir a la página de descarga" +msgstr "https://www.torproject.org/download/download-easy.html\";>Haga click aquà para ir a la página de descargas" msgid "Sorry. You are not using Tor." msgstr "Lo sentimos, no está usando Tor." ___ 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
commit f3f632f268f943cc901ae3e7fc4d2f6bdf3dd9e3 Author: Translation commit bot Date: Mon Aug 18 17:15:13 2014 + Update translations for torcheck --- es/torcheck.po |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/es/torcheck.po b/es/torcheck.po index 1e41f85..de12063 100644 --- a/es/torcheck.po +++ b/es/torcheck.po @@ -3,6 +3,7 @@ # # Translators: # Alexi Ulacio , 2014 +# toypurina , 2014 # her_tor_es_ar , 2014 # Dani_RU , 2014 # gaspa , 2014 @@ -19,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-07-27 07:01+\n" -"Last-Translator: Jonis \n" +"PO-Revision-Date: 2014-08-18 17:10+\n" +"Last-Translator: toypurina \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,7 +45,7 @@ msgstr "Hay una actualización de seguridad disponible para el Paquete de Navega msgid "" "https://www.torproject.org/download/download-easy.html\";>Click " "here to go to the download page" -msgstr "https://www.torproject.org/download/download-easy.html\";>Haga click aqui para ir a la página de descarga" +msgstr "https://www.torproject.org/download/download-easy.html\";>Haga click aquà para ir a la página de descargas" msgid "Sorry. You are not using Tor." msgstr "Lo sentimos, no está usando Tor." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
commit 99a1864f7d380a52343be2c653ef584224952d78 Author: Translation commit bot Date: Mon Aug 18 17:15:26 2014 + Update translations for liveusb-creator --- ca/ca.po |9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ca/ca.po b/ca/ca.po index 3e0e9da..2ac05a9 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -4,6 +4,7 @@ # # Translators: # Albert , 2013 +# dartmalak , 2014 # David Anglada , 2014 # F Xavier Castane , 2013 # Pau Sellés i Garcia , 2013 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-01 22:11+0200\n" -"PO-Revision-Date: 2014-07-02 08:56+\n" -"Last-Translator: runasand \n" +"POT-Creation-Date: 2014-07-20 16:27+0200\n" +"PO-Revision-Date: 2014-08-18 16:51+\n" +"Last-Translator: dartmalak \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -502,7 +503,7 @@ msgstr "El sistema de fitxers %s no està suportat\nSi us plau, guardeu la infor #: ../liveusb/creator.py:882 #, python-format msgid "Updating properties of system partition %(system_partition)s" -msgstr "" +msgstr "Actualitzant les propietats de la partició de sistema %(system_partition)s" #: ../liveusb/launcher_ui.py:154 msgid "Upgrade from ISO" ___ 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
commit e43f19b690aa8018c0c56ca2392dad904da6ebe7 Author: Translation commit bot Date: Mon Aug 18 17:15:06 2014 + Update translations for bridgedb_completed --- es/LC_MESSAGES/bridgedb.po |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po index 3211720..493d1d0 100644 --- a/es/LC_MESSAGES/bridgedb.po +++ b/es/LC_MESSAGES/bridgedb.po @@ -4,6 +4,7 @@ # # Translators: # dark_yoshi , 2014 +# toypurina , 2014 # NinjaTuna , 2011 # Noel Torres , 2013 # Paola Falcon , 2014 @@ -15,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2014-07-26 02:11+\n" -"PO-Revision-Date: 2014-07-27 07:01+\n" -"Last-Translator: Jonis \n" +"PO-Revision-Date: 2014-08-18 17:10+\n" +"Last-Translator: toypurina \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,7 +39,7 @@ msgstr "" #. "Tor Browser" #: lib/bridgedb/HTTPServer.py:121 msgid "Sorry! Something went wrong with your request." -msgstr "¡Lo sentimos! Algo estuvo mal con su solicitud." +msgstr "¡Lo sentimos! Algo ha salido mal con su solicitud. " #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage
commit 92e9f7260f89a3782c9959bb0b248573368ac37c Author: Translation commit bot Date: Mon Aug 18 15:45:49 2014 + Update translations for abouttor-homepage --- zh_HK/aboutTor.dtd | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/zh_HK/aboutTor.dtd b/zh_HK/aboutTor.dtd index 9836fce..568c269 100644 --- a/zh_HK/aboutTor.dtd +++ b/zh_HK/aboutTor.dtd @@ -6,17 +6,17 @@ - - + + - - - - + + + + @@ -29,20 +29,20 @@ - - - + + + https://www.torproject.org/download/download.html.en#warning";> - - + + https://www.torproject.org/docs/tor-doc-relay.html.en";> - + https://www.torproject.org/getinvolved/volunteer.html.en";> https://www.torproject.org/donate/donate.html.en";> - + https://www.torproject.org/about/overview.html.en";> ___ 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
commit cd6450a78f2fc856306781f18c807363b120f2d8 Author: Translation commit bot Date: Mon Aug 18 15:45:25 2014 + Update translations for https_everywhere_completed --- en_GB/ssl-observatory.dtd |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/en_GB/ssl-observatory.dtd b/en_GB/ssl-observatory.dtd index df8f34d..e983913 100644 --- a/en_GB/ssl-observatory.dtd +++ b/en_GB/ssl-observatory.dtd @@ -44,6 +44,12 @@ intrusive corporate network:"> + + + + - + ___ 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
commit 51229a88da20983152ebec524236f39675098e43 Author: Translation commit bot Date: Mon Aug 18 15:45:21 2014 + Update translations for https_everywhere --- en_GB/ssl-observatory.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en_GB/ssl-observatory.dtd b/en_GB/ssl-observatory.dtd index b432a8f..e983913 100644 --- a/en_GB/ssl-observatory.dtd +++ b/en_GB/ssl-observatory.dtd @@ -48,7 +48,7 @@ intrusive corporate network:"> "Show a warning when the Observatory detects a revoked certificate not caught by your browser"> +"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there is a good chance that something is wrong."> ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
commit c6cfefcc76f17d4cf81a56d684d8792773fb10c8 Author: Translation commit bot Date: Mon Aug 18 15:45:29 2014 + Update translations for liveusb-creator --- en_GB/en_GB.po |9 + zh_HK/zh_HK.po | 12 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index bf9bbce..6d90a04 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -6,13 +6,14 @@ # Bruce Cowan , 2010 # eire123 , 2013 # Richard Shaylor , 2014 +# ronnietse , 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-01 22:11+0200\n" -"PO-Revision-Date: 2014-07-02 08:56+\n" -"Last-Translator: runasand \n" +"POT-Creation-Date: 2014-07-20 16:27+0200\n" +"PO-Revision-Date: 2014-08-18 15:34+\n" +"Last-Translator: ronnietse \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -500,7 +501,7 @@ msgstr "Unsupported filesystem: %s\nPlease backup and format your USB key with t #: ../liveusb/creator.py:882 #, python-format msgid "Updating properties of system partition %(system_partition)s" -msgstr "" +msgstr "Updating properties of system partition %(system_partition)s" #: ../liveusb/launcher_ui.py:154 msgid "Upgrade from ISO" diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po index 708a48f..17c56b6 100644 --- a/zh_HK/zh_HK.po +++ b/zh_HK/zh_HK.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-01 22:11+0200\n" -"PO-Revision-Date: 2014-07-02 08:55+\n" -"Last-Translator: runasand \n" +"POT-Creation-Date: 2014-07-20 16:27+0200\n" +"PO-Revision-Date: 2014-08-18 15:34+\n" +"Last-Translator: ronnietse \n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -104,7 +104,7 @@ msgstr "" #: ../liveusb/creator.py:1357 msgid "Cannot find" -msgstr "" +msgstr "æµåå°" #: ../liveusb/creator.py:556 #, python-format @@ -146,7 +146,7 @@ msgstr "ä¸è¼å®æ!" #: ../liveusb/gui.py:751 msgid "Download failed: " -msgstr "" +msgstr "ä¸è¼å¤±æ:" #: ../liveusb/gui.py:88 #, python-format @@ -220,7 +220,7 @@ msgstr "å®è£å·²å®æãæOKéééç¨å¼" #: ../liveusb/creator.py:947 ../liveusb/creator.py:1263 msgid "Installing bootloader..." -msgstr "" +msgstr "å®è£bootloader..." #: ../liveusb/gui.py:269 msgid "LiveUSB creation failed!" ___ 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
commit 827af320a615aebfde547f194519630a657697c6 Author: Translation commit bot Date: Mon Aug 18 15:45:02 2014 + Update translations for bridgedb --- en_GB/LC_MESSAGES/bridgedb.po | 64 - 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/en_GB/LC_MESSAGES/bridgedb.po b/en_GB/LC_MESSAGES/bridgedb.po index 903db73..da9ba81 100644 --- a/en_GB/LC_MESSAGES/bridgedb.po +++ b/en_GB/LC_MESSAGES/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2014-07-26 02:11+\n" -"PO-Revision-Date: 2014-08-18 15:14+\n" +"PO-Revision-Date: 2014-08-18 15:20+\n" "Last-Translator: ronnietse \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -171,32 +171,32 @@ msgstr "Here are your bridge lines:" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" -msgstr "" +msgstr "Get Bridges!" #: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" -msgstr "" +msgstr "Please select options for bridge type:" #: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" -msgstr "" +msgstr "Do you need IPv6 addresses?" #: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" -msgstr "" +msgstr "Do you need a %s?" #: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." -msgstr "" +msgstr "Your browser is not displaying images properly." #: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." -msgstr "" +msgstr "Enter the characters from the image above..." #: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" -msgstr "" +msgstr "How to start using your bridges" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #: lib/bridgedb/strings.py:121 @@ -204,21 +204,21 @@ msgstr "" msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." -msgstr "" +msgstr "To enter bridges into Tor Browser, follow the instructions on the %s Tor\nBrowser download page %s to start Tor Browser." #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:125 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "" +msgstr "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\nthe wizard until it asks:" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "" +msgstr "Does your Internet Service Provider (ISP) block or otherwise censor connections\nto the Tor network?" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:133 @@ -231,45 +231,45 @@ msgstr "" #: lib/bridgedb/strings.py:141 msgid "Displays this message." -msgstr "" +msgstr "Displays this message." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. #: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." -msgstr "" +msgstr "Request vanilla bridges." #: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." -msgstr "" +msgstr "Request IPv6 bridges." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." -msgstr "" +msgstr "Request a Pluggable Transport by TYPE." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". #: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "" +msgstr "Get a copy of BridgeDB's public GnuPG key." #: lib/bridgedb/templates/base.html:92 msgid "Report a Bug" -msgstr "" +msgstr "Report a Bug" #: lib/bridgedb/templates/base.html:94 msgid "Source Code" -msgstr "" +msgstr "Source Code" #: lib/bridgedb/templates/base.html:97 msgid "Changelog" -msgstr "" +msgstr "Changelog" #: lib/bridgedb/templates/base.html:99 msgid "Contact" -msgstr "" +msgstr "Contact" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -281,29 +281,29 @@ msgstr "" #: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." -msgstr "" +msgstr "There are no bridges available currently..." #: lib/bridgedb/templates/bridges.html:73 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "" +msgstr "Pe
[tor-commits] [translation/torcheck] Update translations for torcheck
commit e9fb8717d9060170b953ea1b16ec21baf3e65f45 Author: Translation commit bot Date: Mon Aug 18 15:45:14 2014 + Update translations for torcheck --- zh_HK/torcheck.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/torcheck.po b/zh_HK/torcheck.po index 6007d06..ea8866c 100644 --- a/zh_HK/torcheck.po +++ b/zh_HK/torcheck.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 08:21+\n" +"PO-Revision-Date: 2014-08-18 15:34+\n" "Last-Translator: runasand \n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/torproject/language/zh_HK/)\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/gettor] Update translations for gettor
commit fc90021eccf26f0a4ba14d6b81e3e45e41e5a56d Author: Translation commit bot Date: Mon Aug 18 15:45:08 2014 + Update translations for gettor --- zh_HK/gettor.po |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_HK/gettor.po b/zh_HK/gettor.po index 64ed694..47201af 100644 --- a/zh_HK/gettor.po +++ b/zh_HK/gettor.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-04-26 02:10+\n" +"PO-Revision-Date: 2014-08-18 15:34+\n" "Last-Translator: ronnietse \n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." -msgstr "" +msgstr "ä½ å¥½ï¼å¢åä¿ \"GetTor\" æ©æ¢°äººã" #: lib/gettor/i18n.py:29 msgid "Thank you for your request." -msgstr "" +msgstr "å¤è¬ä½ å è«æ±ã" #: lib/gettor/i18n.py:31 msgid "" @@ -125,7 +125,7 @@ msgstr "" #: lib/gettor/i18n.py:92 msgid "If you select no language, you will receive the English version." -msgstr "" +msgstr "å¦æä½ åæèªè¨ï¼ä½ æå¾å°è±æçæ¬ã" #: lib/gettor/i18n.py:94 msgid "" ___ 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
commit 19ff3f89d8ad624cf5ff00fcdb072c92094be59b Author: Translation commit bot Date: Mon Aug 18 15:15:02 2014 + Update translations for bridgedb --- en_GB/LC_MESSAGES/bridgedb.po | 33 + 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/en_GB/LC_MESSAGES/bridgedb.po b/en_GB/LC_MESSAGES/bridgedb.po index ce66c87..903db73 100644 --- a/en_GB/LC_MESSAGES/bridgedb.po +++ b/en_GB/LC_MESSAGES/bridgedb.po @@ -4,13 +4,14 @@ # # Translators: # Richard Shaylor , 2014 +# ronnietse , 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" "POT-Creation-Date: 2014-07-26 02:11+\n" -"PO-Revision-Date: 2014-07-26 09:42+\n" -"Last-Translator: runasand \n" +"PO-Revision-Date: 2014-08-18 15:14+\n" +"Last-Translator: ronnietse \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -40,24 +41,24 @@ msgstr "" #: lib/bridgedb/strings.py:20 msgid "Here are your bridges:" -msgstr "" +msgstr "Here are your bridges:" #: lib/bridgedb/strings.py:22 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "" +msgstr "You have exceeded the rate limit. Please slow down! The minimum time between\nemails is %s hours. All further emails during this time period will be ignored." #: lib/bridgedb/strings.py:25 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "" +msgstr "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" -msgstr "" +msgstr "Welcome to BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:30 @@ -67,15 +68,15 @@ msgstr "" #: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" -msgstr "" +msgstr "Hey, %s!" #: lib/bridgedb/strings.py:32 msgid "Hello, friend!" -msgstr "" +msgstr "Hello, friend!" #: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 msgid "Public Keys" -msgstr "" +msgstr "Public Keys" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles @@ -85,7 +86,7 @@ msgstr "" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "" +msgstr "This email was generated with rainbows, unicorns, and sparkles\nfor %s on %s at %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -99,7 +100,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "" +msgstr "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\nwhich can help obfuscate your connections to the Tor Network, making it more\ndifficult for anyone watching your internet traffic to determine that you are\nusing Tor.\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: lib/bridgedb/strings.py:54 @@ -107,7 +108,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "" +msgstr "Some bridges with IPv6 addresses are also available, though some Pluggable\nTransports aren't IPv6 compatible.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -121,7 +122,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "" +msgstr "Additionally, BridgeDB has plenty of plain old vanilla bridges %s without any\nPluggable Transports %s which maybe doesn't sound as cool, but they can still\nhelp to circumvent internet censorship in many cases.\n" #: lib/bridgedb/strings.py:76 msgid "What are bridges?" @@ -130,7 +131,7 @@ msgstr "What are bridges?" #: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "" +msgstr "%s Bridges %s are Tor relays that help you circumvent censorship." #: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" @@ -152,7 +153,7 @@ msgstr "My bridges don't work! I need help!" #: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "" +msgstr "If your Tor doesn't work, you should email %s." #.
[tor-commits] [torspec/master] Add consensus method 18 to the list in dir-spec section 3.8.1
commit dc3cefa597c2010e97536fdfbcde10424aea995b Author: Nick Mathewson Date: Mon Aug 18 10:36:41 2014 -0400 Add consensus method 18 to the list in dir-spec section 3.8.1 --- dir-spec.txt |1 + 1 file changed, 1 insertion(+) diff --git a/dir-spec.txt b/dir-spec.txt index 37e3690..109215a 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2122,6 +2122,7 @@ "15" -- Adds support for "p6" lines. "16" -- Adds ntor keys to microdescriptors "17" -- Adds "Unmeasured=1" flags to "w" lines + "18" -- Adds 'id' to microdescriptors. Before generating a consensus, an authority must decide which consensus method to use. To do this, it looks for the highest version number ___ 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] Fix windows warning introduced by 0808ed83f9cf312abe229
commit b159ffb675a274b285acc55204eaf6e83cd72bf8 Author: Nick Mathewson Date: Mon Aug 18 10:19:05 2014 -0400 Fix windows warning introduced by 0808ed83f9cf312abe229 This will fix the warning "/src/or/config.c:6854:48: error: unused parameter 'group_readable'" that I introduced while fixing 12864. Bug not in any released version of Tor. --- src/or/config.c |2 ++ 1 file changed, 2 insertions(+) diff --git a/src/or/config.c b/src/or/config.c index f53186a..6bb6209 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6871,6 +6871,8 @@ init_cookie_authentication(const char *fname, const char *header, log_warn(LD_FS,"Unable to make %s group-readable.", escaped(fname)); } } +#else + (void) group_readable; #endif /* Success! */ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
commit 2937de21803174e14873f68b34ba8a6c62285c45 Merge: 3d6652f b159ffb Author: Nick Mathewson Date: Mon Aug 18 10:20:37 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' src/or/config.c |2 ++ 1 file changed, 2 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Fix windows warning introduced by 0808ed83f9cf312abe229
commit b159ffb675a274b285acc55204eaf6e83cd72bf8 Author: Nick Mathewson Date: Mon Aug 18 10:19:05 2014 -0400 Fix windows warning introduced by 0808ed83f9cf312abe229 This will fix the warning "/src/or/config.c:6854:48: error: unused parameter 'group_readable'" that I introduced while fixing 12864. Bug not in any released version of Tor. --- src/or/config.c |2 ++ 1 file changed, 2 insertions(+) diff --git a/src/or/config.c b/src/or/config.c index f53186a..6bb6209 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6871,6 +6871,8 @@ init_cookie_authentication(const char *fname, const char *header, log_warn(LD_FS,"Unable to make %s group-readable.", escaped(fname)); } } +#else + (void) group_readable; #endif /* Success! */ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Improve comments in checkSpace.pl to explain how to fix its warnings
commit 3d6652f3d1e2ef7533176fc1e0af765f329f85f3
Author: Nick Mathewson
Date: Mon Aug 18 10:03:14 2014 -0400
Improve comments in checkSpace.pl to explain how to fix its warnings
---
scripts/maint/checkSpace.pl | 30 +-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/scripts/maint/checkSpace.pl b/scripts/maint/checkSpace.pl
index 682dbce..b529103 100755
--- a/scripts/maint/checkSpace.pl
+++ b/scripts/maint/checkSpace.pl
@@ -13,30 +13,45 @@ for $fn (@ARGV) {
$incomment = 0;
while () {
## Warn about windows-style newlines.
+ #(We insist on lines that end with a single LF character, not
+ #CR LF.)
if (/\r/) {
print " CR:$fn:$.\n";
}
## Warn about tabs.
+ #(We only use spaces)
if (/\t/) {
print " TAB:$fn:$.\n";
}
-## Warn about markers that don't have a space in front of them
+## Warn about labels that don't have a space in front of them
+ #(We indent every label at least one space)
if (/^[a-zA-Z_][a-zA-Z_0-9]*:/) {
print "nosplabel:$fn:$.\n";
}
## Warn about trailing whitespace.
+ #(We don't allow whitespace at the end of the line; make your
+ #editor highlight it for you so you can stop adding it in.)
if (/ +$/) {
print "Space\@EOL:$fn:$.\n";
}
## Warn about control keywords without following space.
+ #(We put a space after every 'if', 'while', 'for', 'switch', etc)
if ($C && /\s(?:if|while|for|switch)\(/) {
print " KW(:$fn:$.\n";
}
## Warn about #else #if instead of #elif.
+#(We only allow #elif)
if (($lastline =~ /^\# *else/) and ($_ =~ /^\# *if/)) {
print " #else#if:$fn:$.\n";
}
## Warn about some K&R violations
+#(We use K&R-style C, where open braces go on the same line as
+#the statement that introduces them. In other words:
+# if (a) {
+#stuff;
+# } else {
+#other stuff;
+# }
if (/^\s+\{/ and $lastline =~ /^\s*(if|while|for|else if)/ and
$lastline !~ /\{$/) {
print "non-K&R {:$fn:$.\n";
@@ -46,10 +61,13 @@ for $fn (@ARGV) {
}
$lastline = $_;
## Warn about unnecessary empty lines.
+# (Don't put an empty line before a line that contains nothing
+# but a closing brace.)
if ($lastnil && /^\s*}\n/) {
print " UnnecNL:$fn:$.\n";
}
## Warn about multiple empty lines.
+# (At most one blank line in a row.)
if ($lastnil && /^$/) {
print " DoubleNL:$fn:$.\n";
} elsif (/^$/) {
@@ -59,6 +77,7 @@ for $fn (@ARGV) {
}
## Terminals are still 80 columns wide in my world. I refuse to
## accept double-line lines.
+# (Don't make lines wider than 80 characters, including newline.)
if (/^.{80}/) {
print " Wide:$fn:$.\n";
}
@@ -83,11 +102,13 @@ for $fn (@ARGV) {
s!"(?:[^\"]+|\\.)*"!"X"!g;
next if /^\#/;
## Warn about C++-style comments.
+ # (Use C style comments only.)
if (m!//!) {
#print " //:$fn:$.\n";
s!//.*!!;
}
## Warn about unquoted braces preceded by non-space.
+ # (No character except a space should come before a {)
if (/([^\s'])\{/) {
print " $1\{:$fn:$.\n";
}
@@ -101,6 +122,8 @@ for $fn (@ARGV) {
#print " {X:$fn:$.\n";
#}
## Warn about function calls with space before parens.
+ # (Don't put a space between the name of a function and its
+ # arguments.)
if (/(\w+)\s\(([A-Z]*)/) {
if ($1 ne "if" and $1 ne "while" and $1 ne "for" and
$1 ne "switch" and $1 ne "return" and $1 ne "int" and
@@ -110,6 +133,9 @@ for $fn (@ARGV) {
}
}
## Warn about functions not declared at start of line.
+ #(When you're declaring functions, put "static" and "const"
+ #and the return type on one line, and the function name at
+ #the start of a new line.)
if ($in_func_head ||
($fn !~ /\.h$/ && /^[a-zA-Z0-9_]/ &&
! /^(?:const |static )*(?:typedef|struct|union)[^\(]*$/ &&
@@ -130,6 +156,8 @@ for $fn (@ARGV) {
}
}
}
+## Warn if the file doesn't end with a blank line.
+#(End each file with a single blank line.)
if (! $lastnil) {
print " EOL\@EOF:$fn:$.\n";
}
__
[tor-commits] [tor/release-0.2.5] Apply an MSVC compilation fix from Gisle Vanem
commit 789c8d8573b9969acd808bb19d211d4ae9ac3be4 Author: Nick Mathewson Date: Wed Aug 13 15:11:00 2014 -0400 Apply an MSVC compilation fix from Gisle Vanem This fixes a double-define introduced in 28538069b2f1909a7600ec6d --- changes/test.h_msvc |3 +++ src/test/test.h |2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/test.h_msvc b/changes/test.h_msvc new file mode 100644 index 000..3afbc13 --- /dev/null +++ b/changes/test.h_msvc @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): +- Fix compilation of test.h with MSVC. Patch from Gisle Vanem; + bugfix on 0.2.5.5-alpha. diff --git a/src/test/test.h b/src/test/test.h index 861ce5a..b9e4d5b 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -61,7 +61,7 @@ #ifdef _MSC_VER #define U64_PRINTF_TYPE uint64_t -#define U64_PRINTF_TYPE int64_t +#define I64_PRINTF_TYPE int64_t #else #define U64_PRINTF_TYPE unsigned long long #define I64_PRINTF_TYPE long long ___ 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] Restore functionality for CookieAuthFileGroupReadable.
commit 0808ed83f9cf312abe229d0956f0b0132a79962d
Author: Nick Mathewson
Date: Fri Aug 15 08:30:44 2014 -0400
Restore functionality for CookieAuthFileGroupReadable.
When we merged the cookieauthfile creation logic in 33c3e60a37, we
accidentally took out this feature. Fixes bug 12864, bugfix on
0.2.5.1-alpha.
Also adds an ExtORPortCookieAuthFileGroupReadable, since there's no
reason not to.
---
changes/bug12864|7 +++
doc/tor.1.txt |7 +++
src/or/config.c | 11 ++-
src/or/config.h |2 +-
src/or/control.c|1 +
src/or/ext_orport.c |1 +
src/or/or.h |2 ++
7 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/changes/bug12864 b/changes/bug12864
new file mode 100644
index 000..79e751f
--- /dev/null
+++ b/changes/bug12864
@@ -0,0 +1,7 @@
+ o Minor bugfixes:
+- Restore the functionality of CookieAuthFileGroupReadable. Fixes bug
+ 12864; bugfix on 0.2.5.1-alpha.
+
+ o Minor features:
+- Add an ExtORPortCookieAuthFileGroupReadable option to make the
+ cookie file for the ExtORPort g+r by default.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 93d302e..a85bc34 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -224,6 +224,13 @@ GENERAL OPTIONS
for the Extended ORPort's cookie file -- the cookie file is needed
for pluggable transports to communicate through the Extended ORPort.
+[[ExtORPortCookieAuthFileGroupReadable]]
**ExtORPortCookieAuthFileGroupReadable** **0**|**1**::
+If this option is set to 0, don't allow the filesystem group to read the
+Extende OR Port cookie file. If the option is set to 1, make the cookie
+file readable by the default GID. [Making the file readable by other
+groups is not yet implemented; let us know if you need this for some
+reason.] (Default: 0)
+
[[ConnLimit]] **ConnLimit** __NUM__::
The minimum number of file descriptors that must be available to the Tor
process before it will start. Tor will ask the OS for as many file
diff --git a/src/or/config.c b/src/or/config.c
index 2661ce3..20fde3b 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -238,6 +238,7 @@ static config_var_t option_vars_[] = {
V(ExtendAllowPrivateAddresses, BOOL, "0"),
VPORT(ExtORPort, LINELIST, NULL),
V(ExtORPortCookieAuthFile, STRING, NULL),
+ V(ExtORPortCookieAuthFileGroupReadable, BOOL, "0"),
V(ExtraInfoStatistics, BOOL, "1"),
V(FallbackDir, LINELIST, NULL),
@@ -6828,7 +6829,7 @@ config_maybe_load_geoip_files_(const or_options_t
*options,
* cookie_is_set_out to True. */
int
init_cookie_authentication(const char *fname, const char *header,
- int cookie_len,
+ int cookie_len, int group_readable,
uint8_t **cookie_out, int *cookie_is_set_out)
{
char cookie_file_str_len = strlen(header) + cookie_len;
@@ -6861,6 +6862,14 @@ init_cookie_authentication(const char *fname, const char
*header,
goto done;
}
+#ifndef _WIN32
+ if (group_readable) {
+if (chmod(fname, 0640)) {
+ log_warn(LD_FS,"Unable to make %s group-readable.", escaped(fname));
+}
+ }
+#endif
+
/* Success! */
log_info(LD_GENERAL, "Generated auth cookie file in '%s'.", escaped(fname));
*cookie_is_set_out = 1;
diff --git a/src/or/config.h b/src/or/config.h
index bf38613..8a1919c 100644
--- a/src/or/config.h
+++ b/src/or/config.h
@@ -97,7 +97,7 @@ uint32_t get_effective_bwburst(const or_options_t *options);
char *get_transport_bindaddr_from_config(const char *transport);
int init_cookie_authentication(const char *fname, const char *header,
- int cookie_len,
+ int cookie_len, int group_readable,
uint8_t **cookie_out, int *cookie_is_set_out);
or_options_t *options_new(void);
diff --git a/src/or/control.c b/src/or/control.c
index 9285fc5..ec63506 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -4666,6 +4666,7 @@ init_control_cookie_authentication(int enabled)
fname = get_controller_cookie_file_name();
retval = init_cookie_authentication(fname, "", /* no header */
AUTHENTICATION_COOKIE_LEN,
+ get_options()->CookieAuthFileGroupReadable,
&authentication_cookie,
&authentication_cookie_is_set);
tor_free(fname);
diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c
index 0d28a91..9b550ee 100644
--- a/src/or/ext_orport.c
+++ b/src/or/ext_orport.c
@@ -143,6 +143,7 @@ init_ext_or_cookie_authentication(int is_enabled)
fname = get_ext_or_auth_cookie_file_name();
retval = init_cookie_authentication(fname, EXT_OR_PORT_AUTH_COOKIE_HEADER,
EXT_OR_PORT_AUTH_COOKIE_HEADER_LEN,
+
[tor-commits] [tor/release-0.2.5] Some documentation fixes for #12864.
commit 112c984f9242699d273f3096d669eb1024d7f64b Author: George Kadianakis Date: Fri Aug 15 23:12:06 2014 +0300 Some documentation fixes for #12864. --- doc/tor.1.txt |2 +- src/or/config.c |3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 900e588..04d13fb 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -226,7 +226,7 @@ GENERAL OPTIONS [[ExtORPortCookieAuthFileGroupReadable]] **ExtORPortCookieAuthFileGroupReadable** **0**|**1**:: If this option is set to 0, don't allow the filesystem group to read the -Extende OR Port cookie file. If the option is set to 1, make the cookie +Extended OR Port cookie file. If the option is set to 1, make the cookie file readable by the default GID. [Making the file readable by other groups is not yet implemented; let us know if you need this for some reason.] (Default: 0) diff --git a/src/or/config.c b/src/or/config.c index 20fde3b..f53186a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6825,6 +6825,9 @@ config_maybe_load_geoip_files_(const or_options_t *options, * in cookie_out. * Then write it down to fname and prepend it with header. * + * If group_readable is set, set fname to be readable + * by the default GID. + * * If the whole procedure was successful, set * cookie_is_set_out to True. */ int ___ 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 remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5
commit 9f950d80c3547aac8778478a03c1f2c752ef876a Merge: 390728d 967b4e7 Author: Nick Mathewson Date: Mon Aug 18 09:39:32 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5 README|9 +- changes/bug11200-caching |7 + changes/bug12730-systemd-verify-config|3 + changes/bug12731-systemd-no-run-as-daemon |9 + changes/bug12830 |4 + changes/bug12848 |4 + changes/bug12864 |7 + changes/geoip-august2014 |3 + changes/geoip6-august2014 |3 + changes/test.h_msvc |3 + contrib/dist/tor.service.in |5 +- doc/tor.1.txt | 11 +- src/config/geoip | 5217 + src/config/geoip6 | 2012 --- src/or/channel.c |8 + src/or/circuitbuild.c | 12 +- src/or/config.c | 14 +- src/or/config.h |2 +- src/or/control.c |1 + src/or/directory.c|2 +- src/or/ext_orport.c |1 + src/or/nodelist.c | 21 +- src/or/or.h |2 + src/or/routerlist.c |4 +- src/test/test.h |2 +- src/test/test_buffers.c |3 - 26 files changed, 4621 insertions(+), 2748 deletions(-) ___ 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] Documentation fix on arguments to CookieAuthFileGroupReadable
commit 0ee1be0c698fa330a2ee2e4f2818e2118f459517 Author: Nick Mathewson Date: Fri Aug 15 08:32:54 2014 -0400 Documentation fix on arguments to CookieAuthFileGroupReadable We don't actually allow a group name, but the documentation implied that we did. --- doc/tor.1.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a85bc34..900e588 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -319,7 +319,7 @@ GENERAL OPTIONS If set, this option overrides the default location and file name for Tor's cookie file. (See CookieAuthentication above.) -[[CookieAuthFileGroupReadable]] **CookieAuthFileGroupReadable** **0**|**1**|__Groupname__:: +[[CookieAuthFileGroupReadable]] **CookieAuthFileGroupReadable** **0**|**1**:: If this option is set to 0, don't allow the filesystem group to read the cookie file. If the option is set to 1, make the cookie file readable by the default GID. [Making the file readable by other groups is not yet ___ 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 remote-tracking branch 'asn/nickm-bug12864_025' into maint-0.2.5
commit 967b4e7c54b53391e1a0b67e0a5bf70bc2e6a896 Merge: 0cb028b 112c984 Author: Nick Mathewson Date: Fri Aug 15 17:40:13 2014 -0400 Merge remote-tracking branch 'asn/nickm-bug12864_025' into maint-0.2.5 changes/bug12864|7 +++ doc/tor.1.txt |9 - src/or/config.c | 14 +- src/or/config.h |2 +- src/or/control.c|1 + src/or/ext_orport.c |1 + src/or/or.h |2 ++ 7 files changed, 33 insertions(+), 3 deletions(-) ___ 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 remote-tracking branch 'public/bug12848_024' into maint-0.2.5
commit d443658fade3b4090d0b93903b4aec857cab03ea
Merge: 789c8d8 0044d74
Author: Nick Mathewson
Date: Wed Aug 13 23:14:28 2014 -0400
Merge remote-tracking branch 'public/bug12848_024' into maint-0.2.5
Conflicts:
src/or/circuitbuild.c
changes/bug12848 |4
src/or/channel.c |8
src/or/circuitbuild.c | 12
3 files changed, 20 insertions(+), 4 deletions(-)
diff --cc src/or/channel.c
index 3072eff,cd55bd0..ffd6849
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@@ -2681,7 -2622,17 +2681,15 @@@ is_destroy_cell(channel_t *chan
int
channel_send_destroy(circid_t circ_id, channel_t *chan, int reason)
{
- cell_t cell;
-
tor_assert(chan);
+ if (circ_id == 0) {
+ log_warn(LD_BUG, "Attempted to send a destroy cell for circID 0 "
+ "on a channel " U64_FORMAT " at %p in state %s (%d)",
+ U64_PRINTF_ARG(chan->global_identifier),
+ chan, channel_state_to_string(chan->state),
+ chan->state);
+ return 0;
+ }
/* Check to make sure we can send on this channel first */
if (!(chan->state == CHANNEL_STATE_CLOSING ||
diff --cc src/or/circuitbuild.c
index 283afee,5325eff..897f90f
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@@ -657,13 -584,9 +658,11 @@@ circuit_deliver_create_cell(circuit_t *
id = get_unique_circ_id_by_chan(circ->n_chan);
if (!id) {
-log_warn(LD_CIRC,"failed to get unique circID.");
+static ratelim_t circid_warning_limit = RATELIM_INIT(9600);
+log_fn_ratelim(&circid_warning_limit, LOG_WARN, LD_CIRC,
+ "failed to get unique circID.");
- return -1;
+ goto error;
}
- log_debug(LD_CIRC,"Chosen circID %u.", (unsigned)id);
- circuit_set_n_circid_chan(circ, id, circ->n_chan);
memset(&cell, 0, sizeof(cell_t));
r = relayed ? create_cell_format_relayed(&cell, create_cell)
___
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] Remove stale printfs from buffer/zlib_fin_at_chunk_end test
commit 0cb028b7c0d040e49fa7c8569f71a3e44cdd7d1a
Author: Nick Mathewson
Date: Fri Aug 15 09:34:10 2014 -0400
Remove stale printfs from buffer/zlib_fin_at_chunk_end test
These got committed by mistake.
---
src/test/test_buffers.c |3 ---
1 file changed, 3 deletions(-)
diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c
index 61ac5bc..f24b80f 100644
--- a/src/test/test_buffers.c
+++ b/src/test/test_buffers.c
@@ -684,14 +684,11 @@ test_buffers_zlib_fin_at_chunk_end(void *arg)
headerjunk = buf->head->memlen - 7;
write_to_buf(msg, headerjunk-1, buf);
tt_uint_op(buf->head->datalen, ==, headerjunk);
- printf("<%u>\n", (unsigned)buf_datalen(buf));
tt_uint_op(buf_datalen(buf), ==, headerjunk);
/* Write an empty string, with finalization on. */
zlib_state = tor_zlib_new(1, ZLIB_METHOD);
tt_int_op(write_to_buf_zlib(buf, zlib_state, "", 0, 1), ==, 0);
- printf("<%u>\n", (unsigned)buf_datalen(buf));
-
in_len = buf_datalen(buf);
contents = tor_malloc(in_len);
___
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 remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
commit fa7ce6d3be62061de73176ffb939aa8d353d4014 Merge: 4056c61 b45f0f8 Author: Nick Mathewson Date: Wed Aug 13 12:52:40 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/geoip-august2014 |3 + changes/geoip6-august2014 |3 + doc/tor.1.txt |2 +- src/config/geoip | 5217 + src/config/geoip6 | 2012 ++--- 5 files changed, 4518 insertions(+), 2719 deletions(-) ___ 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] Explicitly disable RunAsDaemon in the systemd unit file (#12731).
commit 8b470ee4b54582b599debf5ab5b996eb06525093
Author: intrigeri
Date: Tue Jul 29 12:23:04 2014 +
Explicitly disable RunAsDaemon in the systemd unit file (#12731).
Our current systemd unit uses "Type = simple", so systemd does not expect
tor to
fork. If the user has "RunAsDaemon 1" in their torrc, then things won't
work as
expected. This is e.g. the case on Debian (and derivatives), since there we
pass
"--defaults-torrc /usr/share/tor/tor-service-defaults-torrc" (that contains
"RunAsDaemon 1") by default.
The only solution I could find is to explicitly pass "--RunAsDaemon 0" when
starting tor from the systemd unit file, which this commit does.
---
changes/bug12731-systemd-no-run-as-daemon |9 +
contrib/dist/tor.service.in |4 +++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/changes/bug12731-systemd-no-run-as-daemon
b/changes/bug12731-systemd-no-run-as-daemon
new file mode 100644
index 000..f92e5af
--- /dev/null
+++ b/changes/bug12731-systemd-no-run-as-daemon
@@ -0,0 +1,9 @@
+ o Distribution:
+- Explicitly disable RunAsDaemon in the systemd unit file.
+ Our current systemd unit uses "Type = simple", so systemd does
+ not expect tor to fork. If the user has "RunAsDaemon 1" in their
+ torrc, then things won't work as expected. This is e.g. the case
+ on Debian (and derivatives), since there we pass
+ "--defaults-torrc /usr/share/tor/tor-service-defaults-torrc"
+ (that contains "RunAsDaemon 1") by default.
+ Patch by intrigeri; resolves ticket 12731.
diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in
index 5d76702..1d52f62 100644
--- a/contrib/dist/tor.service.in
+++ b/contrib/dist/tor.service.in
@@ -4,7 +4,9 @@ After = syslog.target network.target nss-lookup.target
[Service]
Type = simple
-ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc
+# A torrc that has "RunAsDaemon 1" won't work with the "simple" service type;
+# let's explicitly override it.
+ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc --RunAsDaemon 0
ExecReload = /bin/kill -HUP ${MAINPID}
KillSignal = SIGINT
TimeoutSec = 30
___
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] Build circuits more readily when DisableNetwork goes to 0
commit fcac4b4467427e8f6ad948e8c8e6f34a0131e716
Author: Roger Dingledine
Date: Tue Aug 5 16:54:46 2014 -0400
Build circuits more readily when DisableNetwork goes to 0
When Tor starts with DisabledNetwork set, it would correctly
conclude that it shouldn't try making circuits, but it would
mistakenly cache this conclusion and continue believing it even
when DisableNetwork is set to 0. Fixes the bug introduced by the
fix for bug 11200; bugfix on 0.2.5.4-alpha.
---
changes/bug11200-caching |7 +++
src/or/nodelist.c| 21 -
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/changes/bug11200-caching b/changes/bug11200-caching
new file mode 100644
index 000..e3fbaec
--- /dev/null
+++ b/changes/bug11200-caching
@@ -0,0 +1,7 @@
+ o Major bugfixes:
+- When Tor starts with DisabledNetwork set, it would correctly
+ conclude that it shouldn't try making circuits, but it would
+ mistakenly cache this conclusion and continue believing it even
+ when DisableNetwork is set to 0. Fixes the bug introduced by the
+ fix for bug 11200; bugfix on 0.2.5.4-alpha.
+
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 8f87081..7b1f338 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1275,10 +1275,21 @@ static char dir_info_status[256] = "";
int
router_have_minimum_dir_info(void)
{
+ static int logged_delay=0;
+ const char *delay_fetches_msg = NULL;
+ if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) {
+if (!logged_delay)
+ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg);
+logged_delay=1;
+strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status));
+return 0;
+ }
+ logged_delay = 0; /* reset it if we get this far */
+
if (PREDICT_UNLIKELY(need_to_update_have_min_dir_info)) {
update_router_have_minimum_dir_info();
-need_to_update_have_min_dir_info = 0;
}
+
return have_min_dir_info;
}
@@ -1498,7 +1509,6 @@ update_router_have_minimum_dir_info(void)
const networkstatus_t *consensus =
networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor());
int using_md;
- const char *delay_fetches_msg = NULL;
if (!consensus) {
if (!networkstatus_get_latest_consensus())
@@ -1511,13 +1521,6 @@ update_router_have_minimum_dir_info(void)
goto done;
}
- if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) {
-log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg);
-strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status));
-res = 0;
-goto done;
- }
-
using_md = consensus->flavor == FLAV_MICRODESC;
{
___
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 remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
commit 244ca67e47238ae8f687c4d4038b7f696824b023 Merge: 691371b b98e3f9 Author: Nick Mathewson Date: Wed Aug 13 12:51:27 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-august2014 |3 + src/config/geoip | 5217 ++ 2 files changed, 3830 insertions(+), 1390 deletions(-) ___ 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 remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into maint-0.2.5
commit 88590ed3a66423fd4de3ad10dc67f1c9b18bf047 Merge: 7760916 0a70579 Author: Nick Mathewson Date: Wed Jul 30 13:59:39 2014 -0400 Merge remote-tracking branch 'intrigeri/bug12730-systemd-verify-config' into maint-0.2.5 changes/bug12730-systemd-verify-config |3 +++ contrib/dist/tor.service.in|1 + 2 files changed, 4 insertions(+) ___ 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] fix three typos in comments
commit 0c869af7f8626cc74a7b82d0c0d6192cbb796d02 Author: Roger Dingledine Date: Wed Aug 6 02:20:51 2014 -0400 fix three typos in comments --- src/or/directory.c |2 +- src/or/routerlist.c |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 22ba056..51ea312 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -349,7 +349,7 @@ should_use_directory_guards(const or_options_t *options) return 1; } -/** Pick an unconsetrained directory server from among our guards, the latest +/** Pick an unconstrained directory server from among our guards, the latest * networkstatus, or the fallback dirservers, for use in downloading * information of type type, and return its routerstatus. */ static const routerstatus_t * diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 8f3477a..b5e9245 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1365,7 +1365,7 @@ router_pick_trusteddirserver(dirinfo_type_t type, int flags) return router_pick_dirserver_generic(trusted_dir_servers, type, flags); } -/** Try to find a running fallback directory Flags are as for +/** Try to find a running fallback directory. Flags are as for * router_pick_directory_server. */ const routerstatus_t * @@ -1374,7 +1374,7 @@ router_pick_fallback_dirserver(dirinfo_type_t type, int flags) return router_pick_dirserver_generic(fallback_dir_servers, type, flags); } -/** Try to find a running fallback directory Flags are as for +/** Try to find a running fallback directory. Flags are as for * router_pick_directory_server. */ static const routerstatus_t * ___ 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] Fix another case of 12848 in circuit_handle_first_hop
commit 0044d74b3c51cf5824435e76eca2a675b51a14bc
Author: Nick Mathewson
Date: Tue Aug 12 12:15:09 2014 -0400
Fix another case of 12848 in circuit_handle_first_hop
I looked for other places where we set circ->n_chan early, and found
one in circuit_handle_first_hop() right before it calls
circuit_send_next_onion_skin(). If onion_skin_create() fails there,
then n_chan will still be set when circuit_send_next_onion_skin()
returns. We should probably fix that too.
---
src/or/circuitbuild.c |1 +
1 file changed, 1 insertion(+)
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 11f8250..5325eff 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -475,6 +475,7 @@ circuit_handle_first_hop(origin_circuit_t *circ)
log_debug(LD_CIRC,"Conn open. Delivering first onion skin.");
if ((err_reason = circuit_send_next_onion_skin(circ)) < 0) {
log_info(LD_CIRC,"circuit_send_next_onion_skin failed.");
+ circ->base_.n_chan = NULL;
return err_reason;
}
}
___
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 remote-tracking branch 'karsten/geoip6-aug2014' into maint-0.2.4
commit b45f0f8fb9b11effcd48159c078f09a3fbc04b11 Merge: 244ca67 6235b47 Author: Nick Mathewson Date: Wed Aug 13 12:51:38 2014 -0400 Merge remote-tracking branch 'karsten/geoip6-aug2014' into maint-0.2.4 changes/geoip6-august2014 |3 + src/config/geoip6 | 2012 +++-- 2 files changed, 687 insertions(+), 1328 deletions(-) ___ 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] Add an extra check in channel_send_destroy for circID==0
commit 981e037fd3b9e20b6e58e9c1470999a0f3a1ef0e
Author: Nick Mathewson
Date: Tue Aug 12 12:14:05 2014 -0400
Add an extra check in channel_send_destroy for circID==0
Prevents other cases of 12848.
---
src/or/channel.c |8
1 file changed, 8 insertions(+)
diff --git a/src/or/channel.c b/src/or/channel.c
index 1270eac..cd55bd0 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -2625,6 +2625,14 @@ channel_send_destroy(circid_t circ_id, channel_t *chan,
int reason)
cell_t cell;
tor_assert(chan);
+ if (circ_id == 0) {
+log_warn(LD_BUG, "Attempted to send a destroy cell for circID 0 "
+ "on a channel " U64_FORMAT " at %p in state %s (%d)",
+ U64_PRINTF_ARG(chan->global_identifier),
+ chan, channel_state_to_string(chan->state),
+ chan->state);
+return 0;
+ }
/* Check to make sure we can send on this channel first */
if (!(chan->state == CHANNEL_STATE_CLOSING ||
___
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] Don't send DESTROY to circID 0 when circuit_deliver_create_cell fails
commit b32a8b024ce3a57f8865ed2937dbc3f3fd5072ee
Author: Nick Mathewson
Date: Tue Aug 12 12:10:57 2014 -0400
Don't send DESTROY to circID 0 when circuit_deliver_create_cell fails
Cypherpunks found this and wrote this patch.
Fix for 12848; fix on (I think) d58d4c0d, which went into 0.0.8pre1
---
changes/bug12848 |4
src/or/circuitbuild.c | 11 +++
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/changes/bug12848 b/changes/bug12848
new file mode 100644
index 000..7aa79c3
--- /dev/null
+++ b/changes/bug12848
@@ -0,0 +1,4 @@
+ o Major bugfixes (relay):
+- Avoid queuing or sending destroy cells for circuit ID zero when
+ we fail to send a CREATE cell. Fixes bug 12848; bugfix on
+ 0.0.8pre1. Found and fixed by "cypherpunks".
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 4603de0..11f8250 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -584,18 +584,18 @@ circuit_deliver_create_cell(circuit_t *circ, const
create_cell_t *create_cell,
id = get_unique_circ_id_by_chan(circ->n_chan);
if (!id) {
log_warn(LD_CIRC,"failed to get unique circID.");
-return -1;
+goto error;
}
- log_debug(LD_CIRC,"Chosen circID %u.", (unsigned)id);
- circuit_set_n_circid_chan(circ, id, circ->n_chan);
memset(&cell, 0, sizeof(cell_t));
r = relayed ? create_cell_format_relayed(&cell, create_cell)
: create_cell_format(&cell, create_cell);
if (r < 0) {
log_warn(LD_CIRC,"Couldn't format create cell");
-return -1;
+goto error;
}
+ log_debug(LD_CIRC,"Chosen circID %u.", (unsigned)id);
+ circuit_set_n_circid_chan(circ, id, circ->n_chan);
cell.circ_id = circ->n_circ_id;
append_cell_to_circuit_queue(circ, circ->n_chan, &cell,
@@ -619,6 +619,9 @@ circuit_deliver_create_cell(circuit_t *circ, const
create_cell_t *create_cell,
}
return 0;
+ error:
+ circ->n_chan = NULL;
+ return -1;
}
/** We've decided to start our reachability testing. If all
___
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] fix extra words in man page
commit 691371b8026d40467662a9c7cf3bd9f788ea6df5 Author: Roger Dingledine Date: Sat Aug 9 15:40:40 2014 -0400 fix extra words in man page --- doc/tor.1.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 4f3612b..ba05968 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1630,7 +1630,7 @@ is non-zero): [[BridgeRecordUsageByCountry]] **BridgeRecordUsageByCountry** **0**|**1**:: When this option is enabled and BridgeRelay is also enabled, and we have -GeoIP data, Tor keeps a keep a per-country count of how many client +GeoIP data, Tor keeps a per-country count of how many client addresses have contacted it so that it can help the bridge authority guess which countries have blocked access to it. (Default: 1) ___ 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 remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' into maint-0.2.5
commit 74a8555d2be2ce9d33e9814212e5de49ba089274
Merge: 88590ed 8b470ee
Author: Nick Mathewson
Date: Wed Jul 30 14:00:21 2014 -0400
Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon'
into maint-0.2.5
Conflicts:
contrib/dist/tor.service.in
changes/bug12731-systemd-no-run-as-daemon |9 +
contrib/dist/tor.service.in |4 +++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --cc contrib/dist/tor.service.in
index 9914a78,1d52f62..2fe51c7
--- a/contrib/dist/tor.service.in
+++ b/contrib/dist/tor.service.in
@@@ -4,8 -4,9 +4,10 @@@ After = syslog.target network.target ns
[Service]
Type = simple
+ExecStartPre = @BINDIR@/tor -f @CONFDIR@/torrc --verify-config
- ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc
+ # A torrc that has "RunAsDaemon 1" won't work with the "simple" service type;
+ # let's explicitly override it.
+ ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc --RunAsDaemon 0
ExecReload = /bin/kill -HUP ${MAINPID}
KillSignal = SIGINT
TimeoutSec = 30
___
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] Fix some URLs in the README
commit 4056c61608f1ede0da56559cb7e56ec2087dc659 Author: Nick Mathewson Date: Sat Aug 9 15:57:06 2014 -0400 Fix some URLs in the README patch from mttp; fixes 12830 --- README |9 - changes/bug12830 |4 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README b/README index b2a391a..e878476 100644 --- a/README +++ b/README @@ -10,17 +10,16 @@ Home page: https://www.torproject.org/ Download new versions: -https://www.torproject.org/download.html +https://www.torproject.org/download/download.html Documentation, including links to installation and setup instructions: -https://www.torproject.org/documentation.html +https://www.torproject.org/docs/documentation.html Making applications work with Tor: -https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO +https://wiki.torproject.org/projects/tor/wiki/doc/TorifyHOWTO Frequently Asked Questions: -https://www.torproject.org/faq.html -https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ +https://www.torproject.org/docs/faq.html To get started working on Tor development: diff --git a/changes/bug12830 b/changes/bug12830 new file mode 100644 index 000..835ebe2 --- /dev/null +++ b/changes/bug12830 @@ -0,0 +1,4 @@ + o Documentation: +- Adjust the URLs in the README to refer to the new locations of + several documents on the website. Patch from Matt Pagan. Fixes + bug 12830. ___ 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] Verify configuration file via ExecStartPre in the systemd unit file (#12730).
commit 0a705797840f893a94bd5b8b2cbb86e58a3a3fc7
Author: intrigeri
Date: Tue Jul 29 12:13:01 2014 +
Verify configuration file via ExecStartPre in the systemd unit file
(#12730).
---
changes/bug12730-systemd-verify-config |3 +++
contrib/dist/tor.service.in|1 +
2 files changed, 4 insertions(+)
diff --git a/changes/bug12730-systemd-verify-config
b/changes/bug12730-systemd-verify-config
new file mode 100644
index 000..221633c
--- /dev/null
+++ b/changes/bug12730-systemd-verify-config
@@ -0,0 +1,3 @@
+ o Distribution:
+- Verify configuration file via ExecStartPre in the systemd unit file.
+ Patch from intrigeri; resolves ticket 12730.
diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in
index 5d76702..9914a78 100644
--- a/contrib/dist/tor.service.in
+++ b/contrib/dist/tor.service.in
@@ -4,6 +4,7 @@ After = syslog.target network.target nss-lookup.target
[Service]
Type = simple
+ExecStartPre = @BINDIR@/tor -f @CONFDIR@/torrc --verify-config
ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc
ExecReload = /bin/kill -HUP ${MAINPID}
KillSignal = SIGINT
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [ooni-probe/master] Fix some errors detected with pyflakes
commit 59adcce1b1b9f3698b58baaa7e42a61c0b334c80
Author: Arturo Filastò
Date: Mon Aug 18 14:09:21 2014 +0200
Fix some errors detected with pyflakes
---
ooni/geoip.py |2 +-
ooni/nettest.py |1 -
ooni/nettests/manipulation/captiveportal.py |5 +
ooni/oonibclient.py |3 ---
ooni/oonicli.py |2 +-
ooni/otime.py |1 -
ooni/settings.py|2 +-
ooni/templates/httpt.py |2 +-
ooni/templates/tcpt.py |1 -
ooni/tests/mocks.py |1 -
ooni/utils/net.py |3 +--
ooni/utils/trueheaders.py | 13 -
ooni/utils/txscapy.py |7 ++-
13 files changed, 12 insertions(+), 31 deletions(-)
diff --git a/ooni/geoip.py b/ooni/geoip.py
index d135595..14dde4b 100644
--- a/ooni/geoip.py
+++ b/ooni/geoip.py
@@ -232,7 +232,7 @@ class ProbeIP(object):
self.address = yield s.lookup()
self.strategy = 'geo_ip_service-' + service_name
break
-except Exception, e:
+except Exception:
log.msg("Failed to lookup your IP via %s" % service_name)
if not self.address:
diff --git a/ooni/nettest.py b/ooni/nettest.py
index 0d5c0f2..3852b40 100644
--- a/ooni/nettest.py
+++ b/ooni/nettest.py
@@ -11,7 +11,6 @@ from twisted.python import usage, reflect
from ooni.tasks import Measurement
from ooni.utils import log, checkForRoot, sanitize_options
from ooni.settings import config
-from ooni import geoip
from ooni import errors as e
diff --git a/ooni/nettests/manipulation/captiveportal.py
b/ooni/nettests/manipulation/captiveportal.py
index eb28104..344ae1c 100644
--- a/ooni/nettests/manipulation/captiveportal.py
+++ b/ooni/nettests/manipulation/captiveportal.py
@@ -28,8 +28,6 @@
# :authors: Jacob Appelbaum, Arturo Filastò, Isis Lovecruft
# :license: see LICENSE for more details
-import base64
-import os
import random
import re
import string
@@ -37,9 +35,8 @@ from urlparse import urlparse
from twisted.names import error
from twisted.python import usage
-from twisted.internet import defer, threads
+from twisted.internet import defer
-from ooni import nettest
from ooni.templates import httpt, dnst
from ooni.utils import net
from ooni.utils import log
diff --git a/ooni/oonibclient.py b/ooni/oonibclient.py
index 7dcc0af..9e08c74 100644
--- a/ooni/oonibclient.py
+++ b/ooni/oonibclient.py
@@ -1,8 +1,5 @@
-import os
import json
-from hashlib import sha256
-
from twisted.web.client import Agent
from twisted.internet import defer, reactor
from twisted.internet.endpoints import TCP4ClientEndpoint
diff --git a/ooni/oonicli.py b/ooni/oonicli.py
index eef3112..4df542f 100644
--- a/ooni/oonicli.py
+++ b/ooni/oonicli.py
@@ -4,7 +4,7 @@ import yaml
from twisted.python import usage
from twisted.python.util import spewer
-from twisted.internet import defer, reactor
+from twisted.internet import defer
from ooni import errors, __version__
diff --git a/ooni/otime.py b/ooni/otime.py
index 21dab42..51124db 100644
--- a/ooni/otime.py
+++ b/ooni/otime.py
@@ -1,4 +1,3 @@
-import time
from datetime import datetime
def prettyDateNow():
diff --git a/ooni/settings.py b/ooni/settings.py
index a5b6468..674b4d3 100644
--- a/ooni/settings.py
+++ b/ooni/settings.py
@@ -10,7 +10,7 @@ from os.path import abspath, expanduser
from scapy.all import get_if_list
from ooni.utils.net import ConnectAndCloseProtocol
-from ooni import otime, geoip
+from ooni import geoip
from ooni.utils import Storage, log
from ooni import errors
diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py
index 18b0d81..e77913d 100644
--- a/ooni/templates/httpt.py
+++ b/ooni/templates/httpt.py
@@ -154,7 +154,7 @@ class HTTPTest(NetTestCase):
response.body = response_body
return response
-def _processResponseBodyFail(self, failure, request):
+def _processResponseBodyFail(self, failure, request, response):
failure_string = handleAllFailures(failure)
HTTPTest.addToReport(self, request, response,
failure_string=failure_string)
diff --git a/ooni/templates/tcpt.py b/ooni/templates/tcpt.py
index 17307fb..bdedebc 100644
--- a/ooni/templates/tcpt.py
+++ b/ooni/templates/tcpt.py
@@ -1,5 +1,4 @@
from twisted.internet import protocol, defer, reactor
-from twisted.internet.error import ConnectionDone
from twisted.internet.endpoints import TCP4ClientEndpoint
from ooni.nettest import NetTestCase
diff --git a/ooni/tests/mocks.py b/ooni/tests/mocks.py
index 72865b1..42f548e 100644
--- a/ooni/tests/mocks.py
+++ b/ooni/tests/mocks.py
@@ -2,7 +2,6 @@ from twisted.python import failure
from twisted.internet import defer
from ooni.tasks import
[tor-commits] [ooni-probe/master] Use vulture to find and delete some dead code.
commit eb417483e4bf8772d9da71c71ecfd30404425320
Author: Arturo Filastò
Date: Mon Aug 18 13:57:11 2014 +0200
Use vulture to find and delete some dead code.
---
ooni/deck.py |1 -
ooni/nettest.py | 18 -
ooni/oonibclient.py | 34 ++---
ooni/otime.py| 21
ooni/ratelimiting.py | 68 --
ooni/settings.py |7 --
6 files changed, 2 insertions(+), 147 deletions(-)
diff --git a/ooni/deck.py b/ooni/deck.py
index 19c7fd5..3f64064 100644
--- a/ooni/deck.py
+++ b/ooni/deck.py
@@ -96,7 +96,6 @@ class Deck(InputFile):
self.bouncer = ''
self.netTestLoaders = []
self.inputs = []
-self.testHelpers = {}
self.oonibclient = OONIBClient(self.bouncer)
diff --git a/ooni/nettest.py b/ooni/nettest.py
index 54a7d28..0d5c0f2 100644
--- a/ooni/nettest.py
+++ b/ooni/nettest.py
@@ -23,24 +23,6 @@ class NoTestCasesFound(Exception):
pass
-def get_test_methods(item, method_prefix="test_"):
-"""
-Look for test_ methods in subclasses of NetTestCase
-"""
-test_cases = []
-try:
-assert issubclass(item, NetTestCase)
-methods = reflect.prefixedMethodNames(item, method_prefix)
-test_methods = []
-for method in methods:
-test_methods.append(method_prefix + method)
-if test_methods:
-test_cases.append((item, test_methods))
-except (TypeError, AssertionError):
-pass
-return test_cases
-
-
def getTestClassFromFile(net_test_file):
"""
Will return the first class that is an instance of NetTestCase.
diff --git a/ooni/oonibclient.py b/ooni/oonibclient.py
index 7676b91..7dcc0af 100644
--- a/ooni/oonibclient.py
+++ b/ooni/oonibclient.py
@@ -13,33 +13,6 @@ from ooni.utils import log
from ooni.utils.net import BodyReceiver, StringProducer, Downloader
from ooni.utils.trueheaders import TrueHeadersSOCKS5Agent
-class Collector(object):
-def __init__(self, address):
-self.address = address
-
-self.nettest_policy = None
-self.input_policy = None
-
-@defer.inlineCallbacks
-def loadPolicy(self):
-# XXX implement caching of policies
-oonibclient = OONIBClient(self.address)
-log.msg("Looking up nettest policy for %s" % self.address)
-self.nettest_policy = yield oonibclient.getNettestPolicy()
-log.msg("Looking up input policy for %s" % self.address)
-self.input_policy = yield oonibclient.getInputPolicy()
-
-def validateInput(self, input_hash):
-for i in self.input_policy:
-if i['id'] == input_hash:
-return True
-return False
-
-def validateNettest(self, nettest_name):
-for i in self.nettest_policy:
-if nettest_name == i['name']:
-return True
-return False
class OONIBClient(object):
retries = 3
@@ -99,7 +72,7 @@ class OONIBClient(object):
bodyProducer = None
if query:
bodyProducer = StringProducer(json.dumps(query))
-
+
def genReceiver(finished, content_length):
def process_response(s):
# If empty string then don't parse it.
@@ -124,9 +97,6 @@ class OONIBClient(object):
return Downloader(download_path, finished, content_length)
return self._request('GET', urn, genReceiver)
-
-def getNettestPolicy(self):
-pass
def getInput(self, input_hash):
from ooni.deck import InputFile
@@ -239,7 +209,7 @@ class OONIBClient(object):
def lookupTestHelpers(self, test_helper_names):
try:
-test_helper = yield self.queryBackend('POST', '/bouncer',
+test_helper = yield self.queryBackend('POST', '/bouncer',
query={'test-helpers': test_helper_names})
except Exception, exc:
log.exception(exc)
diff --git a/ooni/otime.py b/ooni/otime.py
index 0446d4d..21dab42 100644
--- a/ooni/otime.py
+++ b/ooni/otime.py
@@ -1,24 +1,6 @@
import time
from datetime import datetime
-def utcDateNow():
-"""
-Returns the datetime object of the current UTC time.
-"""
-return datetime.utcnow()
-
-def utcTimeNow():
-"""
-Returns seconds since epoch in UTC time, it's of type float.
-"""
-return time.mktime(time.gmtime())
-
-def dateToTime(date):
-"""
-Takes as input a datetime object and outputs the seconds since epoch.
-"""
-return time.mktime(date.timetuple())
-
def prettyDateNow():
"""
Returns a good looking string for the local time.
@@ -31,9 +13,6 @@ def utcPrettyDateNow():
"""
return datetime.utcnow().ctime()
-def timeToPrettyDate(time_val):
-return time.ctime(time_val)
-
class InvalidTimestampFormat(Exception):
pass
diff --git a/ooni/ratelimiting.py b/ooni/ratelimiting.py
deleted file mode 100644
in
[tor-commits] [obfs4/master] Change the drbg seed field in the state file.
commit f32f01ba01351c2cca26be3a62a9c2aa395ee433
Author: Yawning Angel
Date: Mon Aug 18 11:54:39 2014 +
Change the drbg seed field in the state file.
Changing from "drbgSeed" to "drbg-seed" to be consistent with the
ServerTransportOptions to allow for easier copy/paste.
---
transports/obfs4/statefile.go |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/transports/obfs4/statefile.go b/transports/obfs4/statefile.go
index 814a545..e727f7d 100644
--- a/transports/obfs4/statefile.go
+++ b/transports/obfs4/statefile.go
@@ -49,7 +49,7 @@ type jsonServerState struct {
NodeID string `json:"node-id"`
PrivateKey string `json:"private-key"`
PublicKey string `json:"public-key"`
- DrbgSeed string `json:"drbgSeed"`
+ DrbgSeed string `json:"drbg-seed"`
}
type obfs4ServerState struct {
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [obfs4/master] Add support for enabling IAT obfuscation and biased WDist.
commit 22c9dc3f489dd0984e431ede95f963bc1f57222c
Author: Yawning Angel
Date: Mon Aug 18 11:53:22 2014 +
Add support for enabling IAT obfuscation and biased WDist.
Golang's command line parser is slightly cumbersome to use with
subcommands, so the arguments are "obfs4-iatObufscation" and
"obfs-distBias" instead of obfsproxy style subcommands.
---
transports/obfs4/obfs4.go | 26 +-
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/transports/obfs4/obfs4.go b/transports/obfs4/obfs4.go
index 7af7224..fbfea27 100644
--- a/transports/obfs4/obfs4.go
+++ b/transports/obfs4/obfs4.go
@@ -32,6 +32,7 @@ package obfs4
import (
"bytes"
"crypto/sha256"
+ "flag"
"fmt"
"math/rand"
"net"
@@ -55,25 +56,27 @@ const (
privateKeyArg = "private-key"
seedArg = "drbg-seed"
+ iatCmdArg = "obfs4-iatObfuscation"
+ biasCmdArg = "obfs4-distBias"
+
seedLength = 32
headerLength = framing.FrameOverhead + packetOverhead
clientHandshakeTimeout = time.Duration(60) * time.Second
serverHandshakeTimeout = time.Duration(30) * time.Second
replayTTL = time.Duration(3) * time.Hour
- // Use a ScrambleSuit style biased probability table.
- biasedDist = false
-
- // Use IAT obfuscation.
- iatObfuscation = false
-
- // Maximum IAT delay (100 usec increments).
- maxIATDelay = 100
-
+ maxIATDelay= 100
maxCloseDelayBytes = maxHandshakeLength
maxCloseDelay = 60
)
+// iatObfuscation controls if Inter-Arrival Time obfuscation will be enabled.
+var iatObfuscation bool
+
+// biasedDist controls if the probability table will be ScrambleSuit style or
+// uniformly distributed.
+var biasedDist bool
+
type obfs4ClientArgs struct {
nodeID *ntor.NodeID
publicKey *ntor.PublicKey
@@ -573,6 +576,11 @@ func (conn *obfs4Conn) padBurst(burst *bytes.Buffer) (err
error) {
return
}
+func init() {
+ flag.BoolVar(&iatObfuscation, iatCmdArg, false, "Enable obfs4 IAT
obfuscation (expensive)")
+ flag.BoolVar(&biasedDist, biasCmdArg, false, "Enable obfs4 using
ScrambleSuit style table generation")
+}
+
var _ base.ClientFactory = (*obfs4ClientFactory)(nil)
var _ base.ServerFactory = (*obfs4ServerFactory)(nil)
var _ base.Transport = (*Transport)(nil)
___
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
commit 74e9ca1bd3122ef3266380cbcc73082f98ed0172 Author: Translation commit bot Date: Mon Aug 18 11:45:31 2014 + Update translations for tor-launcher-properties --- fr/torlauncher.properties |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/torlauncher.properties b/fr/torlauncher.properties index e4501c1..aea75c6 100644 --- a/fr/torlauncher.properties +++ b/fr/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Lanceur Tor -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited=Tor s'est terminé de manière inattendue. Cela pourrait être dû à un bug dans Tor lui-même, à un autre logiciel sur votre système, ou à un défaut matériel. Jusqu'à ce que vous redémarriez Tor, le navigateur Tor sera incapable d'atteindre un site Web. Si le problème persiste, veuillez envoyer une copie de votre historique Tor à l'équipe d'assistance. +torlauncher.tor_exited2=Redémarrer Tor ne fermera pas les onglets de votre navigateur torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer. torlauncher.tor_control_failed=Ãchec lors de la prise de contrôle de Tor. ___ 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_completed] Update translations for tor-launcher-properties_completed
commit c3bc5e58f7dbd6f6ec5b6683b8b4c90de088a670 Author: Translation commit bot Date: Mon Aug 18 11:45:34 2014 + Update translations for tor-launcher-properties_completed --- fr/torlauncher.properties |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr/torlauncher.properties b/fr/torlauncher.properties index 874e6af..aea75c6 100644 --- a/fr/torlauncher.properties +++ b/fr/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Lanceur Tor -torlauncher.tor_exited=Le programme Tor s'est terminé de manière inatendue. -torlauncher.tor_connection_lost=Votre connexion à Tor a été perdue. +torlauncher.tor_exited=Tor s'est terminé de manière inattendue. Cela pourrait être dû à un bug dans Tor lui-même, à un autre logiciel sur votre système, ou à un défaut matériel. Jusqu'à ce que vous redémarriez Tor, le navigateur Tor sera incapable d'atteindre un site Web. Si le problème persiste, veuillez envoyer une copie de votre historique Tor à l'équipe d'assistance. +torlauncher.tor_exited2=Redémarrer Tor ne fermera pas les onglets de votre navigateur torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer. torlauncher.tor_control_failed=Ãchec lors de la prise de contrôle de Tor. @@ -30,7 +30,7 @@ torlauncher.error_bridge_bad_default_type=Aucun des bridges fournis n'a le type torlauncher.recommended_bridge=(recommandé) torlauncher.connect=Se connecter -torlauncher.reconnect=Reconnecter +torlauncher.restart_tor=Relancer Tor torlauncher.quit=Quitter torlauncher.quit_win=Sortir torlauncher.done=Terminé ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r26922: {website} remove a mirror (website/trunk/include)
Author: phobos Date: 2014-08-18 11:45:28 + (Mon, 18 Aug 2014) New Revision: 26922 Modified: website/trunk/include/tor-mirrors.csv Log: remove a mirror Modified: website/trunk/include/tor-mirrors.csv === --- website/trunk/include/tor-mirrors.csv 2014-08-18 11:44:39 UTC (rev 26921) +++ website/trunk/include/tor-mirrors.csv 2014-08-18 11:45:28 UTC (rev 26922) @@ -30,7 +30,6 @@ Tor Fan, Tor Supporter, UK, United Kingdom, UK, TRUE, FALSE, No, http://tor.mage.me.uk/, , , , http://tor.mage.me.uk/dist/, , , , webmaster AT askapache DOT com, AskApache, US, California, US, TRUE, FALSE, No, http://tor.askapache.com/, , , , http://tor.askapache.com/dist/, , , , Sun Aug 3 22:21:33 2014 nsane2307 eml cc, tor-mirror.de, DE, Germany, Europe, TRUE, FALSE, No, http://tor-mirror.de/, https://tor-mirror.de/, , , http://tor-mirror.de/dist/, https://tor-mirror.de/dist/, , , -Tor Fan, hessmo, US, United States, US, TRUE, FALSE, No, http://mirror.hessmo.com/tor/, , , , http://mirror.hessmo.com/tor/dist/, , , , Sun Aug 3 22:21:33 2014 Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, FALSE, No, http://tor.dev-random.de/, https://tor.dev-random.de/, , , http://tor.dev-random.de/dist/, https://tor.dev-random.de/dist/, , , Sun Mar 2 06:08:00 2014 Tor Fan, India Tor Fans, IN, India, IN, TRUE, FALSE, No, http://www.torproject.org.in/, , , , http://www.torproject.org.in/dist/, , , , Sun Aug 3 22:21:33 2014 mirror-ad...@linsrv.net, linsrv, FR, France, Europe, TRUE, FALSE, No, http://mirrors.linsrv.net/torproject/, , mirrors.linsrv.net::pub/torproject, ftp://ftp.linsrv.net/pub/torproject/, http://mirrors.linsrv.net/torproject/dist/, , mirrors.linsrv.net::pub/torproject/dist, , Sat Apr 26 16:04:13 2014 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r26921: {website} add new mirror (website/trunk/include)
Author: phobos Date: 2014-08-18 11:44:39 + (Mon, 18 Aug 2014) New Revision: 26921 Modified: website/trunk/include/tor-mirrors.csv Log: add new mirror Modified: website/trunk/include/tor-mirrors.csv === --- website/trunk/include/tor-mirrors.csv 2014-08-17 18:39:36 UTC (rev 26920) +++ website/trunk/include/tor-mirrors.csv 2014-08-18 11:44:39 UTC (rev 26921) @@ -106,3 +106,4 @@ torsupport AT tb-itf DOT de, TB-ITF, , DE, Germany, Europe, TRUE, TRUE, No, http://tormirror.tb-itf-tor.de, https://tormirror.tb-itf-tor.de, , , , http://tormirror.tb-itf-tor.de/dist/, https://tormirror.tb-itf-tor.de/dist/, Tor Fan, Ramos Research, US, United States, US, TRUE, TRUE, No, http://tor.ramosresearch.com/, , , , http://tor.ramosresearch.com/dist/, , , , Sun Aug 3 22:21:33 2014 admin at koreswatanabe dottnet, Tor Supporter, RO, Romania, RO, TRUE, TRUE, No, http://tor-relay.koreswatanabe.net, , , , http://tor-relay.koreswatanabe.net/dist/, , , , +Tor Fan, Tor Supporter,DE,Germany,Europe,TRUE,FALSE,No,http://tor.euve33747.vserver.de/http://tor.euve33747.vserver.de/dist \ 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] [ooni-probe/master] Fixed dns_spoof test
commit eca91753ab98118190626f1dbb6b583b54ec18d5
Author: kudrom
Date: Sun Aug 17 22:04:24 2014 +0200
Fixed dns_spoof test
---
ooni/nettests/manipulation/dns_spoof.py | 48 +--
1 file changed, 20 insertions(+), 28 deletions(-)
diff --git a/ooni/nettests/manipulation/dns_spoof.py
b/ooni/nettests/manipulation/dns_spoof.py
index aa464d4..a73ad6e 100644
--- a/ooni/nettests/manipulation/dns_spoof.py
+++ b/ooni/nettests/manipulation/dns_spoof.py
@@ -37,53 +37,45 @@ class DNSSpoof(scapyt.ScapyTest):
requiresTor = False
def setUp(self):
-self.resolverAddr, self.resolverPort = self.localOptions[
-'resolver'].split(':')
+self.resolverAddr, self.resolverPort =
self.localOptions['resolver'].split(':')
self.resolverPort = int(self.resolverPort)
-self.controlResolverAddr, self.controlResolverPort = self.localOptions[
-'backend'].split(':')
+self.controlResolverAddr, self.controlResolverPort =
self.localOptions['backend'].split(':')
self.controlResolverPort = int(self.controlResolverPort)
self.hostname = self.localOptions['hostname']
-def postProcessor(self, report):
+def postProcessor(self, measurements):
"""
This is not tested, but the concept is that if the two responses
match up then spoofing is occuring.
"""
try:
-test_answer = report['test_a_lookup']['answered_packets'][0][1]
-control_answer = report['test_control_a_lookup'][
-'answered_packets'][0][1]
+test_answer = self.report['answered_packets'][0][UDP]
+control_answer = self.report['answered_packets'][1][UDP]
except IndexError:
self.report['spoofing'] = 'no_answer'
-return
-
-if test_answer[UDP] == control_answer[UDP]:
-self.report['spoofing'] = True
else:
-self.report['spoofing'] = False
-return
+if test_answer == control_answer:
+self.report['spoofing'] = False
+else:
+self.report['spoofing'] = True
+return self.report
@defer.inlineCallbacks
def test_a_lookup(self):
-question = IP(dst=self.resolverAddr)/UDP()
-question /= DNS(rd=1, qd=DNSQR(qtype="A",
- qclass="IN",
- qname=self.hostname))
-log.msg(
-"Performing query to %s with %s:%s" %
-(self.hostname, self.resolverAddr, self.resolverPort))
+question = IP(dst=self.resolverAddr) / \
+ UDP() / \
+ DNS(rd=1, qd=DNSQR(qtype="A", qclass="IN",
qname=self.hostname))
+log.msg("Performing query to %s with %s:%s" %
+(self.hostname, self.resolverAddr, self.resolverPort))
yield self.sr1(question)
@defer.inlineCallbacks
def test_control_a_lookup(self):
-question = IP(dst=self.controlResolverAddr)/UDP() / \
-DNS(rd=1, qd=DNSQR(qtype="A", qclass="IN", qname=self.hostname))
-log.msg(
-"Performing query to %s with %s:%s" %
-(self.hostname,
- self.controlResolverAddr,
- self.controlResolverPort))
+question = IP(dst=self.controlResolverAddr) / \
+ UDP() / \
+ DNS(rd=1, qd=DNSQR(qtype="A", qclass="IN",
qname=self.hostname))
+log.msg("Performing query to %s with %s:%s" %
+(self.hostname, self.controlResolverAddr,
self.controlResolverPort))
yield self.sr1(question)
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [ooni-probe/master] Fix unittest for tor silly listener
commit 54d017322c9abdf1acacd2da91be655a724d79e1 Author: Arturo Filastò Date: Mon Aug 18 13:02:37 2014 +0200 Fix unittest for tor silly listener --- ooni/tests/test_settings.py |4 1 file changed, 4 insertions(+) diff --git a/ooni/tests/test_settings.py b/ooni/tests/test_settings.py index e022a64..9687965 100644 --- a/ooni/tests/test_settings.py +++ b/ooni/tests/test_settings.py @@ -47,6 +47,10 @@ class TestSettings(ConfigTestCase): class SillyFactory(Factory): protocol = SillyProtocol +def buildProtocol(self, address): +p = self.protocol(self) +return p + self.silly_listener = reactor.listenTCP(self.conf.tor.socks_port, SillyFactory()) def test_vanilla_configuration(self): ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [ooni-probe/master] Update changelog
commit 71f2b3fcfb3fdccb6ead3467b5bcc63db4113a33 Author: Arturo Filastò Date: Mon Aug 18 12:53:42 2014 +0200 Update changelog --- ChangeLog.md |3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index 40368bc..a349dff 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -32,6 +32,9 @@ Here is a more detailed list of what has been done: Minor bug fixes: +* Fix dns_spoof test (by kudrom) + https://trac.torproject.org/projects/tor/ticket/12486 + * ooni might not look at requiresTor: https://trac.torproject.org/projects/tor/ticket/11858 ___ 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
commit 1e9825e1acc0d020a22a1df4ab5482aedf87a841 Author: Translation commit bot Date: Mon Aug 18 07:45:33 2014 + Update translations for tor-launcher-network-settings --- lo/network-settings.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lo/network-settings.dtd b/lo/network-settings.dtd index ec42517..327cd14 100644 --- a/lo/network-settings.dtd +++ b/lo/network-settings.dtd @@ -23,7 +23,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
