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

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 08 Feb '13

08 Feb '13

commit 8f93ff361a972f40225b107c3fff0dda8364c274 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 8 19:15:29 2013 +0000 Update translations for vidalia_help --- pl/config.po | 37 +++++++++++++++++++------------------ pl/services.po | 21 +++++++++++---------- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/pl/config.po b/pl/config.po index 50e8927..16e8731 100644 --- a/pl/config.po +++ b/pl/config.po @@ -1,12 +1,13 @@ # # Translators: +# <bog.d(a)gazeta.pl>, 2013. 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:58+0200\n" -"PO-Revision-Date: 2010-12-21 22:40+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2013-02-08 18:59+0000\n" +"Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\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/config.html:16 msgid "Configuring Vidalia and Tor" -msgstr "" +msgstr "Konfiguracja Vidalii i Tora" #. type: Content of: <html><body><p> #: en/config.html:20 @@ -30,12 +31,12 @@ msgstr "" #. type: Content of: <html><body> #: en/config.html:26 msgid "<a name=\"general\"/>" -msgstr "" +msgstr "<a name=\"general\"/>" #. type: Content of: <html><body><h3> #: en/config.html:27 msgid "General Settings" -msgstr "" +msgstr "Ustawienia Ogólne" #. type: Content of: <html><body><p> #: en/config.html:29 @@ -64,12 +65,12 @@ msgstr "" #. type: Content of: <html><body> #: en/config.html:46 msgid "<a name=\"network\"/>" -msgstr "" +msgstr "<a name=\"network\"/>" #. type: Content of: <html><body><h3> #: en/config.html:47 msgid "Network Settings" -msgstr "" +msgstr "Ustawienia Sieci" #. type: Content of: <html><body><p> #: en/config.html:49 @@ -120,17 +121,17 @@ msgstr "" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:80 msgid "128.213.48.13:8080" -msgstr "" +msgstr "128.213.48.13:8080" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:83 msgid "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73" -msgstr "" +msgstr "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:86 msgid "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" -msgstr "" +msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" #. type: Content of: <html><body><ul><li> #: en/config.html:89 @@ -144,12 +145,12 @@ msgstr "" #. type: Content of: <html><body> #: en/config.html:100 msgid "<a name=\"relay\"/>" -msgstr "" +msgstr "<a name=\"relay\"/>" #. type: Content of: <html><body><h3> #: en/config.html:101 msgid "Relay Settings" -msgstr "" +msgstr "Ustawienia Przekaźnika" #. type: Content of: <html><body><p> #: en/config.html:103 @@ -161,12 +162,12 @@ msgstr "" #. type: Content of: <html><body> #: en/config.html:109 msgid "<a name=\"appearance\"/>" -msgstr "" +msgstr "<a name=\"appearance\"/>" #. type: Content of: <html><body><h3> #: en/config.html:110 msgid "Appearance Settings" -msgstr "" +msgstr "Ustawienia Wyglądu" #. type: Content of: <html><body><p> #: en/config.html:112 @@ -197,12 +198,12 @@ msgstr "" #. type: Content of: <html><body> #: en/config.html:131 msgid "<a name=\"advanced\"/>" -msgstr "" +msgstr "<a name=\"advanced\"/>" #. type: Content of: <html><body><h3> #: en/config.html:132 msgid "Advanced Settings" -msgstr "" +msgstr "Ustawienia Zaawansowane" #. type: Content of: <html><body><p> #: en/config.html:134 @@ -285,12 +286,12 @@ msgstr "" #. type: Content of: <html><body> #: en/config.html:189 msgid "<a name=\"services\"/>" -msgstr "" +msgstr "<a name=\"services\"/>" #. type: Content of: <html><body><h3> #: en/config.html:190 msgid "Hidden Service Settings" -msgstr "" +msgstr "Ustawienia Usług Ukrytych" #. type: Content of: <html><body><p> #: en/config.html:192 diff --git a/pl/services.po b/pl/services.po index 8a25c19..a46dad6 100644 --- a/pl/services.po +++ b/pl/services.po @@ -1,12 +1,13 @@ # # Translators: +# <bog.d(a)gazeta.pl>, 2013. 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 17:00+0200\n" -"PO-Revision-Date: 2010-11-30 05:03+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2013-02-08 18:54+0000\n" +"Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\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/services.html:16 msgid "Hidden Services" -msgstr "" +msgstr "Usługi Ukryte" #. type: Content of: <html><body> #: en/services.html:19 @@ -27,12 +28,12 @@ msgid "" "configuration. So, don't rely on it, or rather, don't blame us if something " "goes wrong. If you find bugs or have comments on this new feature, please " "let us know! We need your feedback. <a name=\"about\"/>" -msgstr "" +msgstr "Uwaga: Obsługa usług ukrytych jest nowa w Vidalii. Należy oczekiwać błędów, z których część może zepsuć Twoją konfigurację usługi ukrytej. Tak więc, nie polegaj na niej, lub raczej nie wiń nas, jeśli coś pójdzie nie tak. Jeśli znajdziesz błąd lub masz uwagi co do tej nowej funkcjonalności, prosimy daj nam znać! Potrzebujemy informacji od Ciebie.\n<a name=\"about\"/>" #. type: Content of: <html><body><h3> #: en/services.html:26 msgid "What is a hidden service?" -msgstr "" +msgstr "Czym jest Usługa Ukryta?" #. type: Content of: <html><body><p> #: en/services.html:28 @@ -54,7 +55,7 @@ msgstr "" #. type: Content of: <html><body> #: en/services.html:40 msgid "<a name=\"provide\"/>" -msgstr "" +msgstr "<a name=\"provide\"/>" #. type: Content of: <html><body><h3> #: en/services.html:41 @@ -90,7 +91,7 @@ msgstr "" #. type: Content of: <html><body> #: en/services.html:55 msgid "<a name=\"data\"/>" -msgstr "" +msgstr "<a name=\"data\"/>" #. type: Content of: <html><body><h3> #: en/services.html:56 @@ -167,7 +168,7 @@ msgstr "" #. type: Content of: <html><body> #: en/services.html:103 msgid "<a name=\"buttons\"/>" -msgstr "" +msgstr "<a name=\"buttons\"/>" #. type: Content of: <html><body><h3> #: en/services.html:104 @@ -201,7 +202,7 @@ msgstr "" #. type: Content of: <html><body> #: en/services.html:119 msgid "<a name=\"advanced\"/>" -msgstr "" +msgstr "<a name=\"advanced\"/>" #. type: Content of: <html><body><h3> #: en/services.html:120 @@ -229,7 +230,7 @@ msgstr "" #. type: Content of: <html><body> #: en/services.html:135 msgid "<a name=\"client\"/>" -msgstr "" +msgstr "<a name=\"client\"/>" #. type: Content of: <html><body><h3> #: en/services.html:136

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 08 Feb '13

08 Feb '13

commit cb7c2c3322bc2ebc2255da5fc218029c14ec4eb9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 8 18:46:05 2013 +0000 Update translations for mat-gui --- pl.po | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 178 insertions(+), 0 deletions(-) diff --git a/pl.po b/pl.po new file mode 100644 index 0000000..7503bfa --- /dev/null +++ b/pl.po @@ -0,0 +1,178 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <bog.d(a)gazeta.pl>, 2013. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2013-01-05 20:03+0100\n" +"PO-Revision-Date: 2013-02-08 18:46+0000\n" +"Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pl\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: mat-gui:95 mat-gui:563 mat-gui:579 +msgid "Ready" +msgstr "Gotowy" + +#: mat-gui:107 +msgid "Add" +msgstr "Dodaj" + +#: mat-gui:109 mat-gui:183 +msgid "Add files" +msgstr "Dodaj pliki" + +#: mat-gui:113 mat-gui:203 mat-gui:308 mat-gui:311 mat-gui:555 mat-gui:557 +#: mat-gui:573 mat-gui:575 +msgid "Clean" +msgstr "Wyczyść" + +#: mat-gui:115 +msgid "Clean selected files" +msgstr "Wyczyść wybrane pliki" + +#: mat-gui:119 mat-gui:214 +msgid "Check" +msgstr "Sprawdź" + +#: mat-gui:121 +msgid "Check selected files for harmful meta" +msgstr "Sprawdź wybrane pliki pod kątem szkodliwych metadanych" + +#: mat-gui:125 mat-gui:185 +msgid "Quit" +msgstr "Wyjście" + +#: mat-gui:137 +msgid "Path" +msgstr "Ścieżka" + +#: mat-gui:137 mat-gui:363 +msgid "Filename" +msgstr "Nazwa pliku" + +#: mat-gui:137 mat-gui:365 +msgid "Mimetype" +msgstr "Typ mime" + +#: mat-gui:137 +msgid "State" +msgstr "Stan" + +#: mat-gui:138 +msgid "Cleaned file" +msgstr "Wyczyszczony plik" + +#: mat-gui:182 +msgid "Files" +msgstr "Pliki" + +#: mat-gui:188 +msgid "Edit" +msgstr "Edycja" + +#: mat-gui:189 +msgid "Clear the filelist" +msgstr "Wyczyść listę plików" + +#: mat-gui:192 mat-gui:447 +msgid "Preferences" +msgstr "Preferencje" + +#: mat-gui:195 +msgid "Process" +msgstr "Przetwarzanie" + +#: mat-gui:218 +msgid "Help" +msgstr "Pomoc" + +#: mat-gui:219 mat-gui:395 +msgid "Supported formats" +msgstr "Obsługiwane formaty" + +#: mat-gui:220 +msgid "About" +msgstr "O programie" + +#: mat-gui:241 +msgid "Choose files" +msgstr "Wybierz pliki" + +#: mat-gui:248 +msgid "All files" +msgstr "Wszystkie pliki" + +#: mat-gui:255 +msgid "Supported files" +msgstr "Obsługiwane pliki" + +#: mat-gui:297 +msgid "unknow" +msgstr "nieznany" + +#: mat-gui:313 mat-gui:559 +msgid "Dirty" +msgstr "Nieoczyszczony" + +#: mat-gui:343 +msgid "Not-supported" +msgstr "Nieobsługiwany" + +#: mat-gui:381 +msgid "This software was coded during the GSoC 2011" +msgstr "To oprogramowanie zostało wytworzone w ramach GSoC 2011" + +#: mat-gui:386 +msgid "Website" +msgstr "Strona domowa" + +#: mat-gui:461 +msgid "Force Clean" +msgstr "Wymuś wyczyszczenie" + +#: mat-gui:464 +msgid "Do not check if already clean before cleaning" +msgstr "Nie sprawdzaj, czy już wyczyszczony przed czyszczeniem" + +#: mat-gui:468 +msgid "Backup" +msgstr "Kopia zapasowa" + +#: mat-gui:471 +msgid "Keep a backup copy" +msgstr "Zachowaj kopię zapasową" + +#: mat-gui:474 +msgid "Reduce PDF quality" +msgstr "Zmniejsz jakość PDF" + +#: mat-gui:477 +msgid "Reduce the produced PDF size and quality" +msgstr "" + +#: mat-gui:480 +msgid "Add unsupported file to archives" +msgstr "" + +#: mat-gui:484 +msgid "Add non-supported (and so non-anonymised) file to output archive" +msgstr "" + +#: mat-gui:554 +#, python-format +msgid "Checking %s..." +msgstr "" + +#: mat-gui:572 +#, python-format +msgid "Cleaning %s..." +msgstr ""

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 08 Feb '13

08 Feb '13

commit 45271db2a4266eb4f218e01dd4ac15a07d8031c2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 8 18:45:51 2013 +0000 Update translations for https_everywhere --- sl/ssl-observatory.dtd | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sl/ssl-observatory.dtd b/sl/ssl-observatory.dtd index 8ca851a..9692c6e 100644 --- a/sl/ssl-observatory.dtd +++ b/sl/ssl-observatory.dtd @@ -47,8 +47,9 @@ vsiljivo poslovno omrežje:"> <!ENTITY ssl-observatory.prefs.done "Končano"> <!ENTITY ssl-observatory.prefs.explanation -"HTTPS Everywhere can use EFF's SSL Observatory. This does two things: (1)⏎ sends copies of HTTPS certificates to the Observatory, to help us⏎ detect 'man in the middle' attacks and improve the Web's security; and (2)⏎ lets us warn you about insecure connections or attacks on your browser. -HTTPS Everywhere lahko uporablja SSL Observatorij. "> +"HTTPS Everywhere lahko uporablja EFF SSL Observatorij. S tem naredi dvoje: (1) +pošlje kopije HTTPS certifikatov observatoriju, da nam pomaga odkriti napade 'man in the middle' in izboljšati varnost medmrežja; (2) +nam omogoči da vas opozorimo na nevarne povezave ali napade na vaš brskalnik."> <!--<!ENTITY ssl-observatory.prefs.explanation2 "When you visit https://www.example.com, the Observatory will learn that

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 08 Feb '13

08 Feb '13

commit 0a73aa0e19180379bfea4d9b81fe56ac2c852d75 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 8 18:15:53 2013 +0000 Update translations for https_everywhere --- sl/ssl-observatory.dtd | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/sl/ssl-observatory.dtd b/sl/ssl-observatory.dtd index d900a72..8ca851a 100644 --- a/sl/ssl-observatory.dtd +++ b/sl/ssl-observatory.dtd @@ -47,7 +47,8 @@ vsiljivo poslovno omrežje:"> <!ENTITY ssl-observatory.prefs.done "Končano"> <!ENTITY ssl-observatory.prefs.explanation -""> +"HTTPS Everywhere can use EFF's SSL Observatory. This does two things: (1)⏎ sends copies of HTTPS certificates to the Observatory, to help us⏎ detect 'man in the middle' attacks and improve the Web's security; and (2)⏎ lets us warn you about insecure connections or attacks on your browser. +HTTPS Everywhere lahko uporablja SSL Observatorij. "> <!--<!ENTITY ssl-observatory.prefs.explanation2 "When you visit https://www.example.com, the Observatory will learn that

1 0

[stem/master] Using numeric 'flag-thresholds' values
by atagar＠torproject.org 08 Feb '13

08 Feb '13

commit ea5212863a97efa4f29e47280faf3c9566ec5349 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Feb 8 08:29:22 2013 -0800 Using numeric 'flag-thresholds' values Now that the spec has been revised to specify numeric values we can provide 'flag => int/float' mappings (which are much nicer for our users). Spec change: https://gitweb.torproject.org/torspec.git/commitdiff/52d0eb4858ad3eb191df3a… --- stem/descriptor/networkstatus.py | 21 ++++++++++--- test/unit/descriptor/networkstatus/document_v3.py | 32 ++++++++++----------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 3377f5c..3104cad 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -443,7 +443,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): :var list consensus_methods: list of ints for the supported method versions :var datetime published: time when the document was published - :var dict flag_thresholds: **\*** mapping of internal performance thresholds used while making the vote + :var dict flag_thresholds: **\*** mapping of internal performance thresholds used while making the vote, values are **ints** or **floats** **\*** attribute is either required when we're parsed with validation or has a default value, others are left as None if undefined @@ -686,9 +686,6 @@ class _DocumentHeader(object): self.known_flags = [entry for entry in value.split(" ") if entry] elif keyword == "flag-thresholds": # "flag-thresholds" SP THRESHOLDS - # - # TODO: format is being discussed on... - # https://trac.torproject.org/8165 value = value.strip() @@ -701,7 +698,21 @@ class _DocumentHeader(object): raise ValueError("Network status document's '%s' line is expected to be space separated key=value mappings, got: %s" % (keyword, line)) entry_key, entry_value = entry.split("=", 1) - self.flag_thresholds[entry_key] = entry_value + + try: + if entry_value.endswith("%"): + # opting for string manipulation rather than just + # 'float(entry_value) / 100' because floating point arithmetic + # will lose precision + + self.flag_thresholds[entry_key] = float("0." + entry_value[:-1].replace('.', '', 1)) + elif '.' in entry_value: + self.flag_thresholds[entry_key] = float(entry_value) + else: + self.flag_thresholds[entry_key] = int(entry_value) + except ValueError: + if validate: + raise ValueError("Network status document's '%s' line is expected to have float values, got: %s" % (keyword, line)) elif keyword == "params": # "params" [Parameters] # Parameter ::= Keyword '=' Int32 diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index 548d467..1a478cf 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -481,9 +481,9 @@ class TestNetworkStatusDocument(unittest.TestCase): test_values = ( ("", {}), - ("fast-speed=40960", {u"fast-speed": u"40960"}), # numeric value - ("guard-wfu=94.669%", {u"guard-wfu": u"94.669%"}), # percentage value - ("guard-wfu=94.669% guard-tk=691200", {u"guard-wfu": u"94.669%", u"guard-tk": u"691200"}), # multiple values + ("fast-speed=40960", {u"fast-speed": 40960}), # numeric value + ("guard-wfu=94.669%", {u"guard-wfu": 0.94669}), # percentage value + ("guard-wfu=94.669% guard-tk=691200", {u"guard-wfu": 0.94669, u"guard-tk": 691200}), # multiple values ) for test_value, expected_value in test_values: @@ -495,26 +495,24 @@ class TestNetworkStatusDocument(unittest.TestCase): full_line = "stable-uptime=693369 stable-mtbf=153249 fast-speed=40960 guard-wfu=94.669% guard-tk=691200 guard-bw-inc-exits=174080 guard-bw-exc-exits=184320 enough-mtbf=1" expected_value = { - u"stable-uptime": u"693369", - u"stable-mtbf": u"153249", - u"fast-speed": u"40960", - u"guard-wfu": u"94.669%", - u"guard-tk": u"691200", - u"guard-bw-inc-exits": u"174080", - u"guard-bw-exc-exits": u"184320", - u"enough-mtbf": u"1", + u"stable-uptime": 693369, + u"stable-mtbf": 153249, + u"fast-speed": 40960, + u"guard-wfu": 0.94669, + u"guard-tk": 691200, + u"guard-bw-inc-exits": 174080, + u"guard-bw-exc-exits": 184320, + u"enough-mtbf": 1, } document = get_network_status_document_v3({"vote-status": "vote", "flag-thresholds": full_line}) self.assertEquals(expected_value, document.flag_thresholds) - # TODO: At present our validation is pretty permissive since the field - # doesn't yet have a formal specificiation. We should expand this test when - # it does. - test_values = ( - "stable-uptime 693369", # not a key=value mapping - #"stable-uptime=693369\tstable-mtbf=153249", # non-space divider + "stable-uptime 693369", # not a key=value mapping + "stable-uptime=a693369", # non-numeric value + "guard-wfu=94.669%%", # double quote + "stable-uptime=693369\tstable-mtbf=153249", # non-space divider ) for test_value in test_values:

1 0

[stem/master] Noting '(Tor_internal)' addresses in the pydocs
by atagar＠torproject.org 08 Feb '13

08 Feb '13

commit f96d5f64a94ecfa9d05b80e2b3a6c7c3ba78bcea Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Feb 8 08:32:44 2013 -0800 Noting '(Tor_internal)' addresses in the pydocs Noting that StreamEvents can have '(Tor_internal)' as a target address. Spec change: https://gitweb.torproject.org/torspec.git/commitdiff/3ad9d19e03bd816e1e0f0b… --- stem/response/events.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index 486e448..24692d6 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -754,7 +754,7 @@ class StreamEvent(Event): :var stem.StreamStatus status: reported status for the stream :var str circ_id: circuit that the stream is attached to :var str target: destination of the stream - :var str target_address: destination address (ip or hostname) + :var str target_address: destination address (ip, hostname, or '(Tor_internal)') :var int target_port: destination port :var stem.StreamClosureReason reason: reason for the stream to be closed :var stem.StreamClosureReason remote_reason: remote side's reason for the stream to be closed

1 0

r26054: {website} revert previous commit and downgrade all alpha and stable bu (in website/trunk: images/android include)
by Erinn Clark 08 Feb '13

08 Feb '13

Author: erinn Date: 2013-02-08 15:39:20 +0000 (Fri, 08 Feb 2013) New Revision: 26054 Modified: website/trunk/images/android/ website/trunk/include/versions.wmi Log: revert previous commit and downgrade all alpha and stable bundles until we get a new openssl Property changes on: website/trunk/images/android ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2013-02-08 13:10:05 UTC (rev 26053) +++ website/trunk/include/versions.wmi 2013-02-08 15:39:20 UTC (rev 26054) @@ -2,30 +2,30 @@ <define-tag version-alpha whitespace=delete>0.2.4.10-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.4.10-alpha</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.4.9-alpha</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.4.10-alpha</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.4.9-alpha</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.4.10-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.4.10-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.4.10-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.4.9-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.4.9-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.4.9-alpha-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.4.10-alpha</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.4.9-alpha</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.4.10-alpha</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.4.9-alpha</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.4.10-alpha</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.4.9-alpha</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.10-alpha</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.9-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.3.25-3</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.3.25-2</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.7, openssl-1.0.1d</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>10.0.12esr</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.4.6.3</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> @@ -35,10 +35,10 @@ <define-tag version-torbrowserbundlealpha whitespace=delete>2.4.9-alpha-1</define-tag> <define-tag version-torobfsbundlealpha whitespace=delete>2.4.7-alpha-1</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-3</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-3</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.3.25-2</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.3.25-2</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> -<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.7, openssl-1.0.1d</define-tag> +<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>10.0.12esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.6.3</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> @@ -47,8 +47,8 @@ <define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.4.7-alpha-1</define-tag> <define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.4.7-alpha-1</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.3.25-3</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-3</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.3.25-2</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-2</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>10.0.12esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.6.3</define-tag> @@ -75,27 +75,27 @@ <define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.21.exe</define-tag> <define-tag package-win32-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> -<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-stable>-0.2.21-1.exe</define-tag> +<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-stable>-0.2.21.exe</define-tag> <define-tag package-win32-bridge-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-bridge-bundle-stable></define-tag> <define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-alpha>-0.2.21.exe</define-tag> <define-tag package-win32-bridge-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-bridge-bundle-alpha></define-tag> -<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-stable>-0.2.21-1.exe</define-tag> +<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-stable>-0.2.21.exe</define-tag> <define-tag package-win32-relay-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-relay-bundle-stable></define-tag> <define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-alpha>-0.2.21.exe</define-tag> <define-tag package-win32-relay-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-relay-bundle-alpha></define-tag> -<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-stable>-0.2.21-1.exe</define-tag> +<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-stable>-0.2.21.exe</define-tag> <define-tag package-win32-exit-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-exit-bundle-stable></define-tag> <define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-alpha>-0.2.21.exe</define-tag> <define-tag package-win32-exit-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-exit-bundle-alpha></define-tag> -<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.21-i386-1.dmg</define-tag> +<define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.21-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-osx-x86-bundle-stable></define-tag> <define-tag file-osx-x86-bundle-alpha whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-alpha>-0.2.21-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-osx-x86-bundle-alpha></define-tag> -<define-tag package-osx-ppc-bundle-stable whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.21-ppc-1.dmg</define-tag> +<define-tag package-osx-ppc-bundle-stable whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.21-ppc.dmg</define-tag> <define-tag package-osx-ppc-bundle-alpha whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-alpha>-0.2.21-ppc.dmg</define-tag> <define-tag package-osx-x86-stable whitespace=delete>../dist/osx-x86/Tor-<version-osx-stable>-i386-Bundle.dmg</define-tag>

1 0

[tor/master] Comment out now obsolete change in geoip-manual.
by nickm＠torproject.org 08 Feb '13

08 Feb '13

commit 7f805b60487d8a9bff2d93b7b3c655b7b45398e1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 8 14:41:32 2013 +0100 Comment out now obsolete change in geoip-manual. --- src/config/geoip-manual | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/config/geoip-manual b/src/config/geoip-manual index 3811c75..99c897f 100644 --- a/src/config/geoip-manual +++ b/src/config/geoip-manual @@ -5,7 +5,9 @@ # Remove MaxMind entry 0.116.0.0-0.119.255.255 which MaxMind says is AT, # but which is part of reserved range 0.0.0.0/8. -KL 2012-06-13 -"0.116.0.0","0.119.255.255","7602176","7864319","","" +# Disabled, because MaxMind apparently removed this range from their +# database. -KL 2013-02-08 +#"0.116.0.0","0.119.255.255","7602176","7864319","","" # NL, because previous MaxMind entry 31.171.128.0-31.171.133.255 is NL, # and RIR delegation files say 31.171.128.0-31.171.135.255 is NL.

1 0

[tor/master] Merge remote-tracking branch 'karsten/geoip-manual-update'
by nickm＠torproject.org 08 Feb '13

08 Feb '13

commit fd1c2a13e7558086732288eb1a4f52aef2edeb2f Merge: a24f29e 7f805b6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 10:37:34 2013 -0500 Merge remote-tracking branch 'karsten/geoip-manual-update' src/config/geoip-manual | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
by nickm＠torproject.org 08 Feb '13

08 Feb '13

commit b840b76b04fa68d2a1ef9a7532837d1b549daa25 Merge: ae15b55 adff7f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 10:36:34 2013 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-feb2013 | 3 + src/config/geoip | 3509 +++++++++++++++++++++++++++++++++---------------- 2 files changed, 2353 insertions(+), 1159 deletions(-)

1 0