February 2012 - tor-commits - lists.torproject.org

[ooni-probe/master] Fix warning messages on status and add random logo
by art＠torproject.org 29 Feb '12

29 Feb '12

commit 7b7ed0b26ff31d32c945e1ea6b5750978534683c Author: Arturo Filastò <hellais(a)gmail.com> Date: Wed Feb 29 15:04:05 2012 -0800 Fix warning messages on status and add random logo --- logo.py | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++ ooniprobe.py | 61 ++++++++++++++++++---- tests/bridget.py | 3 + tests/dnstamper.py | 3 + tests/traceroute.py | 3 + 5 files changed, 201 insertions(+), 11 deletions(-) diff --git a/logo.py b/logo.py new file mode 100644 index 0000000..dcdf119 --- /dev/null +++ b/logo.py @@ -0,0 +1,142 @@ +import random +def getlogo(): + logo = [] + logo.append(""" + _____ _____ __ _ _____ _____ ______ _____ ______ _______ + | | | | | \ | | |_____] |_____/ | | |_____] |______ + |_____| |_____| | \_| __|__ | | \_ |_____| |_____] |______""") + + logo.append(""" + _ _ + (_) | | + ___ ___ _ __ _ _ __ _ __ ___ | |__ ___ + / _ \ / _ \| '_ \| | '_ \| '__/ _ \| '_ \ / _ \\ +| (_) | (_) | | | | | |_) | | | (_) | |_) | __/ + \___/ \___/|_| |_|_| .__/|_| \___/|_.__/ \___| + | | + |_|""") + + + logo.append(""" + .__ ___. + ____ ____ ____ |__|_____________ ____\_ |__ ____ + / _ \ / _ \ / \| |\____ \_ __ \/ _ \| __ \_/ __ \\ +( <_> | <_> ) | \ || |_> > | \( <_> ) \_\ \ ___/ + \____/ \____/|___| /__|| __/|__| \____/|___ /\___ > + \/ |__| \/ \/""") + + + logo.append(""" + __ __ __ __ __ __ ___ +/ \ / \ |\ | | |__) |__) / \ |__) |__ +\__/ \__/ | \| | | | \ \__/ |__) |___ """) + + + logo.append(""" + _ _ ._ o ._ ._ _ |_ _ + (_) (_) | | | |_) | (_) |_) (/_ + | +""") + + logo.append(""" + _______ _______ __ _ ___ _______ ______ _______ _______ _______ +| || || | | || | | || _ | | || _ || | +| _ || _ || |_| || | | _ || | || | _ || |_| || ___| +| | | || | | || || | | |_| || |_|| | | | || || |___ +| |_| || |_| || _ || | | ___|| __ || |_| || _ | | ___| +| || || | | || | | | | | ||| || |_| || |___ +|_______||_______||_| |__||___| |___| |___| |||_______||_______||_______| +""") + + + logo.append(""" + _ _ + ___ ___ _ __ (_)_ __ _ __ ___ | |__ ___ + / _ \ / _ \| '_ \| | '_ \| '__/ _ \| '_ \ / _ \\ +| (_) | (_) | | | | | |_) | | | (_) | |_) | __/ + \___/ \___/|_| |_|_| .__/|_| \___/|_.__/ \___| + |_| +""") + + logo.append(""" + o + o O + O + o +.oOo. .oOo. 'OoOo. O .oOo. `OoOo. .oOo. OoOo. .oOo. +O o O o o O o O o o O o O o OooO' +o O o O O o O o O O o O o O O +`OoO' `OoO' o O o' oOoO' o `OoO' `OoO' `OoO' + O + o' +""") + + + logo.append(""" + _____ _____ ____ _ ____ _____ _____ _____ ______ ______ + / \/ \| \ | || || || | / \| >| ___| + | || || \| || || _|| \ | || < | ___| + \_____/\_____/|__/\____||____||___| |__|\__\\\\_____/|______>|______| +""") + + logo.append(""" + _ _ + ___ ___ ___|_|___ ___ ___| |_ ___ +| . | . | | | . | _| . | . | -_| +|___|___|_|_|_| _|_| |___|___|___| + |_| +""") + + logo.append(""" + _ _ + (_) | | + ___ ___ ____ _ ____ ____ ___ | |__ _____ + / _ \ / _ \| _ \| | _ \ / ___) _ \| _ \| ___ | +| |_| | |_| | | | | | |_| | | | |_| | |_) ) ____| + \___/ \___/|_| |_|_| __/|_| \___/|____/|_____) + |_| +""") + logo.append(""" + _ __ + ____ ____ ____ (_)____ _________ / /_ ___ + / __ \/ __ \/ __ \/ // __ \/ ___/ __ \/ __ \/ _ \\ +/ /_/ / /_/ / / / / // /_/ / / / /_/ / /_/ / __/ +\____/\____/_/ /_/_// .___/_/ \____/_.___/\___/ + /_/ +""") + logo.append(""" + _) | + _ \ _ \ \ | _ \ _| _ \ _ \ -_) + \___/ \___/ _| _| _| .__/ _| \___/ _.__/ \___| + _| +""") + logo.append(""" + _ _ + ___ ___ _ __ (_)_ __ _ __ ___ | |__ ___ + / _ \ / _ \| '_ \| | '_ \| '__/ _ \| '_ \ / _ \\ + | (_) | (_) | | | | | |_) | | | (_) | |_) | __/ + \___/ \___/|_| |_|_| .__/|_| \___/|_.__/ \___| + |_| +""") + logo.append(""" + .-. ( ) + .--. .--. ___ .-. ( __) .-.. ___ .-. .--. | |.-. .--. + / \ / \ ( ) \ (''") / \ ( ) \ / \ | / \ / \ +| .-. ; | .-. ; | .-. . | | ' .-, ; | ' .-. ; | .-. ; | .-. | | .-. ; +| | | | | | | | | | | | | | | | . | | / (___) | | | | | | | | | | | | +| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ | +| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ' _.' +| ' | | | ' | | | | | | | | | | ' | | | | ' | | | ' | | | .'.-. +' `-' / ' `-' / | | | | | | | `-' ' | | ' `-' / ' `-' ; ' `-' / + `.__.' `.__.' (___)(___) (___) | \__.' (___) `.__.' `.__. `.__.' + | | + (___) +""") + logo.append(""" + o | +,---.,---.,---..,---.,---.,---.|---.,---. +| || || ||| || | || ||---' +`---'`---'` '`|---'` `---'`---'`---' + | +""") + return random.choice(logo) diff --git a/ooniprobe.py b/ooniprobe.py old mode 100644 new mode 100755 index 64d35f5..958c9b1 --- a/ooniprobe.py +++ b/ooniprobe.py @@ -1,5 +1,5 @@ -# -*- coding: UTF-8 #!/usr/bin/env python +# -*- coding: UTF-8 """ ooni-probe ********** @@ -19,15 +19,18 @@ import imp import os import sys +import argparse from pprint import pprint import plugoo from utils import Storage, parse_asset, import_test, get_logger from config import Config +from logo import getlogo class ooni(object): - """ooni-probe is a suite designed to run tests on your + """ + ooni-probe is a suite designed to run tests on your network to detect censorship. This is the main class that is used to start ooni probe select the assets and run tests. @@ -46,13 +49,14 @@ class ooni(object): self.get_assets() self.tests = Storage() - self.load_tests() + #self.load_tests() self.runtests = self.config.tests.run.split(",") def get_assets(self): - """Parse all the assets in the asset directory. + """ + Parse all the assets in the asset directory. Assets can optionaly contain the ooni-probe asset file format: #:<something> <something_else>, that will then be used to render the asset details to the user. @@ -65,7 +69,8 @@ class ooni(object): self.assets.append(parse_asset(asset)) def list_assets(self): - """Enumerate all the assets in the directory specified + """ + Enumerate all the assets in the directory specified in the config file """ print "[-] There are a total of %s assets loaded" % len(self.assets) @@ -80,7 +85,8 @@ class ooni(object): print "" def load_tests(self): - """Iterate through the plugoos insite the folder specified by the + """ + Iterate through the plugoos insite the folder specified by the config file and instantiate them. """ pluginfiles = [fname[:-3] for fname in os.listdir(self.config.main.testdir)\ @@ -108,8 +114,10 @@ class ooni(object): print "Failed to load the test %s %s" % (name, e) def list_tests(self): - """Print the loaded plugoonis to screen """ + Print the loaded plugoonis to screen + """ + self.load_tests() print "[-] There are a total of %s tests available" % len(self.tests) for name, test in self.tests.items(): print " name: %s" % name @@ -121,8 +129,10 @@ class ooni(object): def run_tests(self): - """Run all the tests that have been loaded """ + Run all the tests that have been loaded + """ + self.load_tests() for name in self.runtests: print "running %s" % name try: @@ -131,12 +141,41 @@ class ooni(object): print "ERR: %s" % e def run_test(self, test): - """Run a single test """ + Run a single test + """ + self.load_tests() self.tests[test].module.run(self) if __name__ == "__main__": + o = ooni() - o.list_tests() - o.run_test("bridget") + + parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter, + description=getlogo()+'\n\n Open Observatory of Network Interference.') + parser.add_argument('-t', '--list-tests', help='List all the available tests', + action='store_true', dest='list_tests') + + parser.add_argument('-l', '--list-assets', help='List all the assets', + action='store_true', dest='list_assets') + + parser.add_argument('-r', '--run', help='Run a certain test', action='store') + + parser.add_argument('-a', '--asset', help='Use this asset for the test', action='store') + + parser.add_argument('--runall', help='Run all the tests in the config', action='store_true') + + args = parser.parse_args() + + if args.list_tests: + o.list_tests() + + if args.list_assets: + o.list_assets() + + if args.run: + o.run_test(args.run) + + elif args.runall: + o.run_tests() diff --git a/tests/bridget.py b/tests/bridget.py index 59d7800..c4515aa 100644 --- a/tests/bridget.py +++ b/tests/bridget.py @@ -36,6 +36,9 @@ try: except: print "Error TorCtl not installed!" +__plugoo__ = "BridgeT" +__desc__ = "BridgeT, for testing Tor Bridge reachability" + class SocksiPyConnection(httplib.HTTPConnection): def __init__(self, proxytype, proxyaddr, proxyport = None, rdns = True, username = None, password = None, *args, **kwargs): diff --git a/tests/dnstamper.py b/tests/dnstamper.py index 987a948..06b3551 100644 --- a/tests/dnstamper.py +++ b/tests/dnstamper.py @@ -7,6 +7,9 @@ import os import plugoo from plugoo import Plugoo, Asset +__plugoo__ = "DNST" +__desc__ = "DNS censorship detection test" + class DNSTAsset(Asset): def __init__(self, file=None): self = Asset.__init__(self, file) diff --git a/tests/traceroute.py b/tests/traceroute.py index d7e722a..f2272c9 100644 --- a/tests/traceroute.py +++ b/tests/traceroute.py @@ -15,6 +15,9 @@ from plugoo import Plugoo, Asset import socket +__plugoo__ = "Traceroute" +__desc__ = "Performs TTL walking tests" + class TracerouteAsset(Asset): def __init__(self, file=None): self = Asset.__init__(self, file)

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 29 Feb '12

29 Feb '12

commit 834b8f4a98a39a74c33732bc6dff6768ed72f621 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 29 20:45:19 2012 +0000 Update translations for vidalia_help --- sk/index.po | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sk/index.po b/sk/index.po index 8ec004c..fb83a53 100644 --- a/sk/index.po +++ b/sk/index.po @@ -1,12 +1,13 @@ # # Translators: +# <koloman375(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:59+0200\n" -"PO-Revision-Date: 2010-11-30 05:02+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-02-29 20:37+0000\n" +"Last-Translator: K0L0M4N <koloman375(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,7 +18,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/index.html:16 msgid "Vidalia Help" -msgstr "" +msgstr "Pomocník Vidalia" #. type: Content of: <html><body> #: en/index.html:20 @@ -31,12 +32,12 @@ msgstr "" msgid "" "You can use the Find button on the toolbar above to search within a " "particular help topic." -msgstr "" +msgstr "Môžete použiť tlačidlo Hľadať " #. type: Content of: <html><body> #: en/index.html:30 msgid "The Home button above will bring you back to this home page." -msgstr "" +msgstr "Tlačidlom Domov sa dostanete naspä" #. type: Content of: <html><body> #: en/index.html:34

1 0

[tor/master] Don't cannibalize already cannibalized circuits
by nickm＠torproject.org 29 Feb '12

29 Feb '12

commit 2755b09c52f78f233ed96aef41d283eb52cc89e8 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Feb 25 17:58:09 2012 +0100 Don't cannibalize already cannibalized circuits This ensures we don't build circuits that have 5 hops or more. Patch contributed by wanoskarnet, thanks! --- changes/bug5231 | 5 +++++ src/or/circuitlist.c | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug5231 b/changes/bug5231 new file mode 100644 index 0000000..f64f7b6 --- /dev/null +++ b/changes/bug5231 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Ensure we don't cannibalize circuits that are longer than three hops + already, so we don't end up making circuits with 5 or more hops. Patch + contributed by wanoskarnet. Fixes bug 5231; bugfix on 0.1.0.1-rc which + introduced cannibalization. diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 49a9b05..85f5291 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1086,6 +1086,7 @@ circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info, (!need_capacity || circ->build_state->need_capacity) && (internal == circ->build_state->is_internal) && circ->remaining_relay_early_cells && + circ->build_state->desired_path_len == DEFAULT_ROUTE_LEN && !circ->build_state->onehop_tunnel && !circ->isolation_values_set) { if (info) {

1 0

[tor/master] Merge remote-tracking branch 'sebastian/bug5231'
by nickm＠torproject.org 29 Feb '12

29 Feb '12

commit 6a0d809f44afa4c20382030191bd69cf0017d03a Merge: 406bc95 2755b09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 29 15:16:15 2012 -0500 Merge remote-tracking branch 'sebastian/bug5231' changes/bug5231 | 5 +++++ src/or/circuitlist.c | 1 + 2 files changed, 6 insertions(+), 0 deletions(-)

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 29 Feb '12

29 Feb '12

commit 45c7b83d5881c2287b096f67cdc0d3f7b14cc6c1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 29 20:15:03 2012 +0000 Update translations for gettor --- sk/gettor.po | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sk/gettor.po b/sk/gettor.po index 5dfdf69..0e5aca6 100644 --- a/sk/gettor.po +++ b/sk/gettor.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-02-29 19:44+0000\n" +"PO-Revision-Date: 2012-02-29 20:01+0000\n" "Last-Translator: K0L0M4N <koloman375(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -31,7 +31,7 @@ msgid "" "Unfortunately, we won't answer you at this address. You should make\n" "an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" "one of those." -msgstr "Nanešťastie Vám odpovieme na túto adresu. Mali by ste si\nvytvoriť konto na GMAIL.COM, YAHOO.COM alebo YAHOO.CN a \nodoslať email z nich" +msgstr "Nanešťastie Vám neodpovieme na túto adresu. Mali by ste si\nvytvoriť konto na GMAIL.COM, YAHOO.COM alebo YAHOO.CN a \nz tade potom pošlite email." #: lib/gettor/i18n.py:35 msgid "" @@ -199,7 +199,7 @@ msgstr "PODPORA\n========" msgid "" "Here's your requested software as a zip file. Please unzip the\n" "package and verify the signature." -msgstr "Tu je Váš požadovaný softvér ako zip súbor. Rozbaľte balík\na overte podpis." +msgstr "Tu je Váš požadovaný softvér ako zip súbor. Rozbaľte balík a overte \npodpis." #: lib/gettor/i18n.py:136 msgid "" @@ -240,7 +240,7 @@ msgid "" "is no complete public list of them, even if your ISP is filtering\n" "connections to all the known Tor relays, they probably won't be able\n" "to block all the bridges." -msgstr "Ak vaše internetové pripojenie blokuje prístup do siete Tor, tak potom\npotrebujete premosťovacie relay. Premosťovacie relay (alebo skrátene\n\"mosty\") sú Tor relay, ktoré nie sú zahrnuté v koreňovom adresáre. Keďže\nneexistuje úplný verejný zoznam mostov, tak ak by aj Váš poskytovateľ\ninternetového pripojenia blokoval všetky známe Tor relay, pravdepodobne\nnebude schopný blokovať všetky mosty." +msgstr "Ak vaše internetové pripojenie blokuje prístup do siete Tor, tak potom\npotrebujete premosťovacie relay. Premosťovacie relay (alebo skrátene\n\"mosty\") sú Tor relay, ktoré nie sú zahrnuté v hlavnom adresáre. Keďže\nneexistuje úplný verejný zoznam mostov, tak ak by aj Váš poskytovateľ\ninternetového pripojenia blokoval všetky známe Tor relay, pravdepodobne\nnebude schopný blokovať všetky mosty." #: lib/gettor/i18n.py:162 msgid "" @@ -254,7 +254,7 @@ msgstr "Môžete požiadať o most, ak pošlete email, ktorý bude v tele emailu msgid "" "It is also possible to fetch bridges with a web browser at the following\n" "url: https://bridges.torproject.org/" -msgstr "Je možné získať mosty pomocou internetového prehliadača na\nadrese: https://bridges.torproject.org/" +msgstr "Je možné získať mosty pomocou internetového prehliadača na adrese:\nhttps://bridges.torproject.org/" #: lib/gettor/i18n.py:170 msgid "" @@ -263,7 +263,7 @@ msgid "" "all split files to be received by you before you can save them all\n" "into the same directory and unpack them by double-clicking the\n" "first file." -msgstr "DÔLEŽITÁ POZNÁMKA:" +msgstr "DÔLEŽITÁ POZNÁMKA:\nKeďže toto je požiadavka, v ktorej Vám pošleme viacej súborov, tak musíte\npočkať na všetky časti súboru a potom ich môžete uložiť do jedného\npriečinka a rozbaliť dvojitým kliknutím na prvý súbor." #: lib/gettor/i18n.py:176 msgid "" @@ -282,13 +282,13 @@ msgstr "Vaša požiadavka sa práve spracováva.\nVáš balík (%s) by mal prís msgid "" "If it doesn't arrive, the package might be too big for your mail provider.\n" "Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account." -msgstr "Ak neprišiel, tak balík bol možno príliš veľký pre Vášho emailového poskytovateľa.\nSkúste preposlať mail z účtu GMAIL.COM, YAHOO.CN ALEBO YAHOO.COM." +msgstr "Ak neprišiel, tak balík bol možno príliš veľký pre Vášho emailového poskytovateľa.\nSkúste preposlať mail z účtu GMAIL.COM, YAHOO.CN alebo YAHOO.COM." #: lib/gettor/i18n.py:185 msgid "" "Unfortunately we are currently experiencing problems and we can't fulfill\n" "your request right now. Please be patient as we try to resolve this issue." -msgstr "Nanešťastie máme teraz nejaké problémy a nemôžeme vybaviť Vašu\npožiadavku. Prosím buďte trpezlivý, kým nevyriešime tento problém." +msgstr "Nanešťastie máme teraz nejaké problémy a nemôžeme vybaviť Vašu\npožiadavku. Prosím, buďte trpezlivý, kým nevyriešime tento problém." #: lib/gettor/i18n.py:188 msgid "" @@ -331,7 +331,7 @@ msgstr "Alternatívna cesta ako extrahovať súbory s príponou .z je, že zmen msgid "" "Please reply to this mail, and tell me a single package name anywhere\n" "in your reply. Here's a short explanation of what these packages are:" -msgstr "Prosím odpovedz na tento mail a napíš so tela emailu názov jedného balíka.\nTu je krátke vysvetlenie o čom sú tieto balíky:" +msgstr "Prosím odpovedz na tento email a napíš do tela emailu názov jedného balíka.\nTu je krátke vysvetlenie o čom sú tieto balíky:" #: lib/gettor/i18n.py:213 msgid "" @@ -346,7 +346,7 @@ msgid "" "macos-i386:\n" "The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n" "general, newer Mac hardware will require you to use this package." -msgstr "macos-i386:\nTor Browser Bundle pre OS X, architektúru Intel CPU.\nVo všeobecnosti, novší Mac hardware bude vyžadovať práve tento balík." +msgstr "macos-i386:\nTor Browser Bundle pre OS X, architektúru Intel CPU.\nVo všeobecnosti, novší Mac hardvér bude vyžadovať práve tento balík." #: lib/gettor/i18n.py:222 msgid "" @@ -391,7 +391,7 @@ msgstr "Čo je Tor?" #: lib/gettor/i18n.py:243 msgid "The name \"Tor\" can refer to several different components." -msgstr "Názov \"Tor\" sa môže vzťahovať niekoľkým rôznym komponentom." +msgstr "Názov \"Tor\" sa môže vzťahovať k niekoľkým rôznym komponentom." #: lib/gettor/i18n.py:245 msgid "" @@ -404,7 +404,7 @@ msgid "" "Tor network. You can read more about how Tor works here:\n" "\n" " https://www.torproject.org/about/overview.html.en" -msgstr "Program Tor Vám umožní ostať na Internete v bezpečí. Tor presmeruje Vašu \nkomunikáciu cez sieť vytvorenú dobrovoľníkmi z celého sveta: zabraňuje to,\naby niekto mohol zistiť aké stránky navštevujete a zabraňuje stránkam \nzistiť miesto, kde sa nachádzate. Táto sieť dobrovoľníkov sa volá sieť Tor.\nViac informácií o tom ako Tor funguje nájdete tu:\n\n https://www.torproject.org/about/overview.html.en" +msgstr "Program Tor Vám umožní ostať na Internete v bezpečí. Tor presmeruje Vašu \nkomunikáciu cez sieť vytvorenú dobrovoľníkmi z celého sveta: zabraňuje,\naby niekto mohol zistiť aké stránky navštevujete a zabraňuje stránkam \nzistiť miesto, kde sa nachádzate. Táto sieť dobrovoľníkov sa volá sieť Tor.\nViac informácií o tom ako Tor funguje nájdete tu:\n\n https://www.torproject.org/about/overview.html.en" #: lib/gettor/i18n.py:255 msgid "What is the Tor Browser Bundle?"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 29 Feb '12

29 Feb '12

commit ceb4303e996d48f722421c841100fea560cdab1f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 29 19:45:04 2012 +0000 Update translations for gettor --- sk/gettor.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sk/gettor.po b/sk/gettor.po index 68a5d84..5dfdf69 100644 --- a/sk/gettor.po +++ b/sk/gettor.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-02-29 19:13+0000\n" +"PO-Revision-Date: 2012-02-29 19:44+0000\n" "Last-Translator: K0L0M4N <koloman375(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -45,7 +45,7 @@ msgid "" "(We apologize if you didn't ask for this mail. Since your email is from\n" "a service that doesn't use DKIM, we're sending a short explanation,\n" "and then we'll ignore this email address for the next day or so.)" -msgstr "(Ospravedlňujeme sa, ak ste o nechceli tento email. Kvôli tomu, že Vaša emailová služba\nnepoužíva DKIM, posielame Vám krátke vysvetlenie a následne\nbudeme túto emailovú adresu pár dní ignorovať.)" +msgstr "(Ospravedlňujeme sa, ak ste o tento email nepožiadali. Kvôli tomu, že Vaša emailová služba\nnepoužíva DKIM, posielame Vám krátke vysvetlenie a následne\nbudeme túto emailovú adresu pár dní ignorovať.)" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" @@ -95,7 +95,7 @@ msgstr "Tento príklad Vám pošle lokalizovanú verziu v jazyku Farsi (Perzšti #: lib/gettor/i18n.py:71 msgid " List of supported locales:" -msgstr "Zoznam podporovaných jazykov:" +msgstr " Zoznam podporovaných jazykov:" #: lib/gettor/i18n.py:73 msgid "Here is a list of all available languages:" @@ -140,7 +140,7 @@ msgid "" " \n" " windows\n" " split" -msgstr "" +msgstr "Jednoducho pridajte slovo 'split' do nového riadku (toto je dôležité!)\nnasledujúcim spôsobom:\n \n windows\n split" #: lib/gettor/i18n.py:102 msgid "" @@ -296,7 +296,7 @@ msgid "" "requested. Please send us another package name or request the same package \n" "again, but remove the 'split' keyword. In that case we'll send you the whole \n" "package. Make sure this is what you want." -msgstr "" +msgstr "Nanešťastie balík, o ktorý žiadate nie je rozdelený na menšie časti. \nProsím požiadajte o iný balík alebo požiadajte znova o ten istý balík,\nale teraz odstráňte slovo 'split'. V tomto prípade Vám pošleme celý balík.\nUistite sa, že práve tento chcete. " #: lib/gettor/i18n.py:193 msgid "" @@ -404,7 +404,7 @@ msgid "" "Tor network. You can read more about how Tor works here:\n" "\n" " https://www.torproject.org/about/overview.html.en" -msgstr "" +msgstr "Program Tor Vám umožní ostať na Internete v bezpečí. Tor presmeruje Vašu \nkomunikáciu cez sieť vytvorenú dobrovoľníkmi z celého sveta: zabraňuje to,\naby niekto mohol zistiť aké stránky navštevujete a zabraňuje stránkam \nzistiť miesto, kde sa nachádzate. Táto sieť dobrovoľníkov sa volá sieť Tor.\nViac informácií o tom ako Tor funguje nájdete tu:\n\n https://www.torproject.org/about/overview.html.en" #: lib/gettor/i18n.py:255 msgid "What is the Tor Browser Bundle?"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 29 Feb '12

29 Feb '12

commit 69f5188729db8e02db3b526abfc9211c30198252 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 29 19:15:04 2012 +0000 Update translations for gettor --- sk/gettor.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sk/gettor.po b/sk/gettor.po index dbdcabc..68a5d84 100644 --- a/sk/gettor.po +++ b/sk/gettor.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-02-28 20:36+0000\n" +"PO-Revision-Date: 2012-02-29 19:13+0000\n" "Last-Translator: K0L0M4N <koloman375(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -131,7 +131,7 @@ msgid "" "If your bandwith is low or your provider doesn't allow you to\n" "receive large attachments in your email, GetTor can send you several\n" "small packages instead of one big one." -msgstr "" +msgstr "Ak je Vaše pripojenie príliš pomalé alebo Váš poskytovateľ Vám nepovoľuje\nprijímať veľké prílohy vo Vašich emailoch, GetTor Vám môže poslať niekoľko\nmenších balíkov namiesto jedného veľkého." #: lib/gettor/i18n.py:96 msgid "" @@ -240,7 +240,7 @@ msgid "" "is no complete public list of them, even if your ISP is filtering\n" "connections to all the known Tor relays, they probably won't be able\n" "to block all the bridges." -msgstr "" +msgstr "Ak vaše internetové pripojenie blokuje prístup do siete Tor, tak potom\npotrebujete premosťovacie relay. Premosťovacie relay (alebo skrátene\n\"mosty\") sú Tor relay, ktoré nie sú zahrnuté v koreňovom adresáre. Keďže\nneexistuje úplný verejný zoznam mostov, tak ak by aj Váš poskytovateľ\ninternetového pripojenia blokoval všetky známe Tor relay, pravdepodobne\nnebude schopný blokovať všetky mosty." #: lib/gettor/i18n.py:162 msgid "" @@ -391,7 +391,7 @@ msgstr "Čo je Tor?" #: lib/gettor/i18n.py:243 msgid "The name \"Tor\" can refer to several different components." -msgstr "" +msgstr "Názov \"Tor\" sa môže vzťahovať niekoľkým rôznym komponentom." #: lib/gettor/i18n.py:245 msgid ""

1 0

[torspec/master] Add proposal 194 by Saizai and Alex Fink
by ioerror＠torproject.org 29 Feb '12

29 Feb '12

commit 7b76d529802740b11af62b5ded6f61dc5d39c1d4 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Feb 29 15:09:17 2012 -0400 Add proposal 194 by Saizai and Alex Fink --- proposals/000-index.txt | 2 + proposals/194-mnemonic-urls.txt | 200 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 202 insertions(+), 0 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 73cdd5b..95dd4d4 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -114,6 +114,7 @@ Proposals by number: 191 Bridge Detection Resistance against MITM-capable Adversaries [OPEN] 192 Automatically retrieve and store information about bridges [OPEN] 193 Safe cookie authentication for Tor controllers [OPEN] +194 Mnemonic .onion URLs [OPEN] Proposals by status: @@ -149,6 +150,7 @@ Proposals by status: 191 Bridge Detection Resistance against MITM-capable Adversaries 192 Automatically retrieve and store information about bridges [for 0.2.[45].x] 193 Safe cookie authentication for Tor controllers + 194 Mnemonic .onion URLs ACCEPTED: 117 IPv6 exits [for 0.2.3.x] 140 Provide diffs between consensuses diff --git a/proposals/194-mnemonic-urls.txt b/proposals/194-mnemonic-urls.txt new file mode 100644 index 0000000..7d66196 --- /dev/null +++ b/proposals/194-mnemonic-urls.txt @@ -0,0 +1,200 @@ +Filename: 194-mnemonic-urls.txt +Title: Mnemonic .onion URLs +Author: Sai, Alex Fink +Created: 29-Feb-2012 +Status: Open + +1. Overview + + Currently, canonical Tor .onion URLs consist of a naked 80-bit hash[1]. This + is not something that users can even recognize for validity, let alone produce + directly. It is vulnerable to partial-match fuzzing attacks[2], where a + would-be MITM attacker generates a very similar hash and uses various social + engineering, wiki poisoning, or other methods to trick the user into visiting + the spoof site. + + This proposal gives an alternative method for displaying and entering .onion + and other URLs, such that they will be easily remembered and generated by end + users, and easily published by hidden service websites, without any dependency + on a full domain name type system like e.g. namecoin[3]. This makes it easier + to implement (requiring only a change in the proxy). + + This proposal could equally be used for IPv4, IPv6, etc, if normal DNS is for + some reason untrusted. + + This is not a petname system[4], in that it does not allow service providers + or users[5] to associate a name of their choosing to an address[6]. Rather, it + is a mnemonic system that encodes the 80 bit .onion address into a + meaningful[7] and memorable sentence. A full petname system (based on + registration of some kind, and allowing for shorter, service-chosen URLs) can + be implemented in parallel[8]. + + This system has the three properties of being secure, distributed, and + human-meaningful — it just doesn't also have choice of name (except of course + by brute force creation of multiple keys to see if one has an encoding the + operator likes). + + This is inspired by Jonathan Ackerman's "Four Little Words" proposal[9] for + doing the same thing with IPv4 addresses. We just need to handle 80+ bits, not + just 32 bits. + + It is similar to Markus Jakobsson & Ruj Akavipat's FastWord system[10], except + that it does not permit user choice of passphrase, does not know what URL a + user will enter (vs verifying against a single stored password), and again has + to encode significantly more data. + + This is also similar to RFC1751[11], RFC2289[12], and multiple other + fingerprint encoding systems[13] (e.g. PGPfone[14] using the PGP + wordlist[15], and Arturo Filatsò's OnionURL[16]), but we aim to make something + that's as easy as possible for users to remember — and significantly easier + than just a list of words or pseudowords, which we consider only useful as an + active confirmation tool, not as something that can be fully memorized and + recalled, like a normal domain name. + +2. Requirements + +2.1. encodes at least 80 bits of random data (preferably more, eg for a +checksum) + +2.2. valid, visualizable English sentence — not just a series of words[17] + +2.3. words are common enough that non-native speakers and bad spellers will have +minimum difficulty remembering and producing (perhaps with some spellcheck help) + +2.4. not syntactically confusable (e.g. order should not matter) + +2.5. short enough to be easily memorized and fully recalled at will, not just +recognized + +2.6. no dependency on an external service + +2.7. dictionary size small enough to be reasonable for end users to download as +part of the onion package + +2.8. consistent across users (so that websites can e.g. reinforce their random +hash's phrase with a clever drawing) + +2.9. not create offensive sentences that service providers will reject + +2.10. resistant against semantic fuzzing (e.g. by having uniqueness against +WordNet synsets[18]) + +3. Possible implementations + + This section is intentionally left unfinished; full listing of template + sentences and the details of their parser and generating implementation is + co-dependent on the creation of word class dictionaries fulfilling the above + criteria. Since that's fairly labor-intensive, we're pausing at this stage for + input first, to avoid wasting work. + +3.1. Have a fixed number of template sentences, such as: + + 1. Adj subj adv vtrans adj obj + 2. Subj and subj vtrans adj obj + 3. … etc + + For a 6 word sentence, with 8 (3b) templates, we need ~12b (4k word) + dictionaries for each word category. + + If multiple words of the same category are used, they must either play + different grammatical roles (eg subj vs obj, or adj on a different item), be + chosen from different dictionaries, or there needs to be an order-agnostic way + to join them at the bit level. Preferably this should be avoided, just to + prevent users forgetting the order. + +3.2. As 3.1, but treat sentence generation as decoding a prefix code, and have + a Huffman code for each word class. + + We suppose it’s okay if the generated sentence has a few more words than it + might, as long as they’re common lean words. E.g., for adjectives, "good" + might cost only six bits while "unfortunate" costs twelve. + + Choice between different sentence syntaxes could be worked into the prefix + code as well, and potentially done separately for each syntactic constituent. + +4. Usage + + To form mnemonic .onion URL, just join the words with dashes or underscores, + stripping minimal words like 'a', 'the', 'and' etc., and append '.onion'. This + can be readily distinguished from standard hash-style .onion URLs by form. + + Translation should take place at the client — though hidden service servers + should also be able to output the mnemonic form of hashes too, to assist + website operators in publishing them (e.g. by posting an amusing drawing of + the described situation on their website to reinforce the mnemonic). + + After the translation stage of name resolution, everything proceeds as normal + for an 80-bit hash onion URL. + + The user should be notified of the mnemonic form of hash URL in some way, and + have an easy way in the client UI to translate mnemonics to hashes and vice + versa. For the purposes of browser URLs and the like though, the mnemonic + should be treated on par with the hash; if the user enters a mnemonic URL they + should not become redirected to the hash version. (If anything, the opposite + may be true, so that users become used to seeing and verifying the mnemonic + version of hash URLs, and gain the security benefits against partial-match + fuzzing.) + + Ideally, inputs that don't validly resolve should have a response page served + by the proxy that uses a simple spell-check system to suggest alternate domain + names that are valid hash encodings. This could hypothetically be done inline + in URL input, but would require changes on the browser (normally domain names + aren't subject so spellcheck), and this avoids that implementation problem. + +5. International support + + It is not possible for this scheme to support non-English languages without + a) (usually) Unicode in domains (which is not yet well supported by browsers), + and + b) fully customized dictionaries and phrase patterns per language + + The scheme must not be used in an attempted 'translation' by simply replacing + English words with glosses in the target language. Several of the necessary + features would be completely mangled by this (e.g. other languages have + different synonym, homonym, etc groupings, not to mention completely different + grammar). + + It is unlikely a priori that URLs constructed using a non-English + dictionary/pattern setup would in any sense 'translate' semantically to + English; more likely is that each language would have completely unrelated + encodings for a given hash. + + We intend to only make an English version at first, to avoid these issues + during testing. + +________________ + +[1] https://trac.torproject.org/projects/tor/wiki/doc/HiddenServiceNames +https://gitweb.torproject.org/torspec.git/blob/HEAD:/address-spec.txt +[2] http://www.thc.org/papers/ffp.html +[3] http://dot-bit.org/Namecoin +[4] https://en.wikipedia.org/wiki/Zooko's_triangle +[5] https://addons.mozilla.org/en-US/firefox/addon/petname-tool/ +[6] However, service operators can generate a large number of hidden service +descriptors and check whether their hashes result in a desirable phrasal +encoding (much like certain hidden services currently use brute force generated +hashes to ensure their name is the prefix of their raw hash). This won't get you +whatever phrase you want, but will at least improve the likelihood that it's +something amusing and acceptable. +[7] "Meaningful" here inasmuch as e.g. "Barnaby thoughtfully mangles simplistic +yellow camels" is an absurdist but meaningful sentence. Absurdness is a feature, +not a bug; it decreases the probability of mistakes if the scenario described is +not one that the user would try to fit into a template of things they have +previously encountered IRL. See research into linguistic schema for further +details. +[8] https://gitweb.torproject.org/torspec.git/blob/HEAD:/proposals/ideas/xxx-oni +on-nyms.txt +[9] http://blog.rabidgremlin.com/2010/11/28/4-little-words/ +[10] http://fastword.me/ +[11] https://tools.ietf.org/html/rfc1751 +[12] http://tools.ietf.org/html/rfc2289 +[13] https://github.com/singpolyma/mnemonicode +http://mysteryrobot.com +https://github.com/zacharyvoase/humanhash +[14] http://www.mathcs.duq.edu/~juola/papers.d/icslp96.pdf +[15] http://en.wikipedia.org/wiki/PGP_word_list +[16] https://github.com/hellais/Onion-url +https://github.com/hellais/Onion-url/blob/master/dev/mnemonic.py +[17] http://www.reddit.com/r/technology/comments/ecllk +[18] http://wordnet.princeton.edu/wordnet/man2.1/wnstats.7WN.html +

1 0

[tor/release-0.2.2] new ip address for maatuska
by arma＠torproject.org 29 Feb '12

29 Feb '12

commit e21756908f0cc4a475129ee96b1f9eb7ed8d3397 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 29 13:22:41 2012 -0500 new ip address for maatuska --- changes/maatuska-ip | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/maatuska-ip b/changes/maatuska-ip new file mode 100644 index 0000000..a00b43f --- /dev/null +++ b/changes/maatuska-ip @@ -0,0 +1,3 @@ + o Directory authority changes: + - Change IP address for maatuska (v3 directory authority). + diff --git a/src/or/config.c b/src/or/config.c index 94a6538..c3e285d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -820,7 +820,7 @@ add_default_trusted_dir_authorities(authority_type_t type) "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", "maatuska orport=80 no-v2 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " - "213.115.239.118:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", + "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", NULL }; for (i=0; dirservers[i]; i++) {

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 29 Feb '12

29 Feb '12

commit 30d0319684afcf337f7fccbc695a84279c9d7d0a Merge: 121ae29 e217569 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 29 13:25:13 2012 -0500 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug5065 | 5 + changes/bug5067 | 5 + changes/geoip-february2012 | 3 + changes/maatuska-ip | 3 + src/common/Makefile.am | 4 +- src/common/tortls.c | 6 +- src/config/geoip |12782 +++++++++++++++++++++++++------------------- src/or/Makefile.am | 4 +- src/or/config.c | 2 +- src/or/routerlist.c | 6 +- 10 files changed, 7217 insertions(+), 5603 deletions(-)

1 0