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

[torbrowser/master] Merge branch 'maint-2.3' into maint-2.4
by erinn＠torproject.org 05 Feb '13

05 Feb '13

commit 0fe45fd2e59ec9b9ff4726dc64f85ab4d514d952 Merge: 22c493a ab533c3 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 5 18:13:05 2013 +0100 Merge branch 'maint-2.3' into maint-2.4 README.LINUX-2.3 | 6 +++--- README.OSX-2.3 | 6 +++--- README.WIN-2.3 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.… [View More]

1 0

[torbrowser/master] update alpha bundles to openssl 1.0.1d
by erinn＠torproject.org 05 Feb '13

05 Feb '13

commit dacbd0a32598b5dffe6e2aec39d59d6cede56d0a Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 5 18:15:43 2013 +0100 update alpha bundles to openssl 1.0.1d --- README.LINUX-2.4 | 2 +- README.OSX-2.4 | 2 +- README.WIN-2.4 | 2 +- build-scripts/versions-alpha.mk | 2 +- changelog.linux-2.4 | 3 ++- changelog.osx-2.4 | 3 ++- changelog.windows-2.4 | 3 ++- 7 files … [View More]changed, 10 insertions(+), 7 deletions(-) diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index 2482e2c..18d3b2e 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.10-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.4.10-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1d) Firefox 17.0.2esr \_ Torbutton 1.5.0pre-alpha |_ NoScript 2.6.4.4 diff --git a/README.OSX-2.4 b/README.OSX-2.4 index 4607cea..4c4f018 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.10-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.4.10-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1d) Firefox 17.0.2esr \_ Torbutton 1.5.0pre-alpha |_ NoScript 2.6.4.4 diff --git a/README.WIN-2.4 b/README.WIN-2.4 index 7caf620..df08643 100644 --- a/README.WIN-2.4 +++ b/README.WIN-2.4 @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.10-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.4.10-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1d) Firefox 17.0.2esr \_ Torbutton 1.5.0pre-alpha |_ NoScript 2.6.4.4 diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 70f5a17..abc7578 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.4.10-alpha ZLIB_VER=1.2.7 -OPENSSL_VER=1.0.1c +OPENSSL_VER=1.0.1d LIBPNG_VER=1.5.13 QT_VER=4.8.1 VIDALIA_VER=0.2.21 diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index 52390ad..89734db 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -1,10 +1,11 @@ Tor Browser Bundle (2.4.10-alpha-1); suite=linux * Update Tor to 0.2.4.10-alpha + * Update OpenSSL to 1.0.1d * Update NoScript to 2.6.4.4 * Add PDF Viewer (PDF.js) to README - -- Erinn Clark <erinn(a)torproject.org> Tue Feb 5 12:59:27 CET 2013 + -- Erinn Clark <erinn(a)torproject.org> Tue Feb 5 18:13:28 CET 2013 Tor Browser Bundle (2.4.9-alpha-1); suite=linux diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index d3271f8..f099bd0 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -1,10 +1,11 @@ Tor Browser Bundle (2.4.10-alpha-1); suite=osx * Update Tor to 0.2.4.10-alpha + * Update OpenSSL to 1.0.1d * Update NoScript to 2.6.4.4 * Add PDF Viewer (PDF.js) to README - -- Erinn Clark <erinn(a)torproject.org> Tue Feb 5 12:59:21 CET 2013 + -- Erinn Clark <erinn(a)torproject.org> Tue Feb 5 18:13:28 CET 2013 Tor Browser Bundle (2.4.9-alpha-1); suite=osx diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index 434aa07..c77200b 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -1,10 +1,11 @@ Tor Browser Bundle (2.4.10-alpha-1); suite=windows * Update Tor to 0.2.4.10-alpha + * Update OpenSSL to 1.0.1d * Update NoScript to 2.6.4.4 * Add PDF Viewer (PDF.js) to README - -- Erinn Clark <erinn(a)torproject.org> Tue Feb 5 12:59:23 CET 2013 + -- Erinn Clark <erinn(a)torproject.org> Tue Feb 5 18:13:28 CET 2013 Tor Browser Bundle (2.4.9-alpha-test-1); suite=windows [View Less]

1 0

[torbrowser/maint-2.4] bump stable bundles to 2.2.35-3 for openssl 1.0.1d
by erinn＠torproject.org 05 Feb '13

05 Feb '13

commit ab533c3e45d08d588b6d6e61a6ea70c617a4fb24 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 5 18:12:40 2013 +0100 bump stable bundles to 2.2.35-3 for openssl 1.0.1d --- README.LINUX-2.3 | 6 +++--- README.OSX-2.3 | 6 +++--- README.WIN-2.3 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.3 |… [View More] 8 ++++++++ changelog.osx-2.3 | 8 ++++++++ changelog.windows-2.3 | 8 ++++++++ 10 files changed, 39 insertions(+), 15 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index 612b5af..19db511 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1d) Firefox 10.0.12esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.6.4.2 - |_ HTTPS-Everywhere 3.1.2 + |_ NoScript 2.6.4.4 + |_ HTTPS-Everywhere 3.1.3 Usage ----- diff --git a/README.OSX-2.3 b/README.OSX-2.3 index 1883159..2405545 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1d) Firefox 10.0.12esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.6.4.2 - |_ HTTPS-Everywhere 3.1.2 + |_ NoScript 2.6.4.4 + |_ HTTPS-Everywhere 3.1.3 Usage ----- diff --git a/README.WIN-2.3 b/README.WIN-2.3 index 472c1f2..f8f766f 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.1d) Firefox 10.0.12esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.6.4.2 - |_ HTTPS-Everywhere 3.1.2 + |_ NoScript 2.6.4.4 + |_ HTTPS-Everywhere 3.1.3 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 854bae5..cda9b7e 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 39b0158..f420e46 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 05a098b..138b28d 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.3.25 ZLIB_VER=1.2.7 -OPENSSL_VER=1.0.1c +OPENSSL_VER=1.0.1d LIBPNG_VER=1.5.13 QT_VER=4.8.1 VIDALIA_VER=0.2.21 @@ -14,8 +14,8 @@ FIREFOX_VER=10.0.12esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6.3 -NOSCRIPT_VER=2.6.4.2 -HTTPSEVERYWHERE_VER=3.1.2 +NOSCRIPT_VER=2.6.4.4 +HTTPSEVERYWHERE_VER=3.1.3 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index cef0386..876973a 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index c366730..7592000 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.3.25-3); suite=linux + + * Update OpenSSL to 1.0.1d + * Update HTTPS Everywhere to 3.1.3 + * Update NoScript to 2.6.4.4 + + -- Erinn Clark <erinn(a)torproject.org> Tue Feb 5 18:08:43 CET 2013 + Tor Browser Bundle (2.3.25-2); suite=linux * Update Firefox to 10.0.12esr diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index 040e1aa..d4e331a 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.3.25-3); suite=osx + + * Update OpenSSL to 1.0.1d + * Update HTTPS Everywhere to 3.1.3 + * Update NoScript to 2.6.4.4 + + -- Erinn Clark <erinn(a)torproject.org> Tue Feb 5 18:08:39 CET 2013 + Tor Browser Bundle (2.3.25-2); suite=osx * Update Firefox to 10.0.12esr diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index 77c5bdc..990d0f2 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.3.25-3); suite=windows + + * Update OpenSSL to 1.0.1d + * Update HTTPS Everywhere to 3.1.3 + * Update NoScript to 2.6.4.4 + + -- Erinn Clark <erinn(a)torproject.org> Tue Feb 5 18:08:41 CET 2013 + Tor Browser Bundle (2.3.25-2); suite=windows * Update Firefox to 10.0.12esr [View Less]

1 0

[torbrowser/maint-2.4] Merge branch 'maint-2.3' into maint-2.4
by erinn＠torproject.org 05 Feb '13

05 Feb '13

commit 0fe45fd2e59ec9b9ff4726dc64f85ab4d514d952 Merge: 22c493a ab533c3 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 5 18:13:05 2013 +0100 Merge branch 'maint-2.3' into maint-2.4 README.LINUX-2.3 | 6 +++--- README.OSX-2.3 | 6 +++--- README.WIN-2.3 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.… [View More]

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 05 Feb '13

05 Feb '13

commit 412abac926c19c0d29d7ed7ae15dd7780640bde8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 5 16:45:44 2013 +0000 Update translations for vidalia_help_completed --- eu/troubleshooting.po | 245 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 245 insertions(+), 0 deletions(-) diff --git a/eu/troubleshooting.po b/eu/troubleshooting.po new file mode 100644 index 0000000..a4f44bc --- /dev/null +++ b/eu/troubleshooting.po @@ -0,0 +1,… [View More]245 @@ +# +# Translators: +# Antxon Baldarra <baldarra(a)euskalerria.org>, 2012-2013. +# <baldarra(a)euskalerria.org>, 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-08-03 15:49-0300\n" +"PO-Revision-Date: 2013-02-05 16:28+0000\n" +"Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\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: eu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +# type: Content of: <html><body><h1> +#: en/troubleshooting.html:16 +msgid "Troubleshooting" +msgstr "Arazoen konponketa" + +# type: Content of: <html><body> +#: en/troubleshooting.html:19 +msgid "" +"Listed below are some of the common problems or questions people have while " +"running Tor. If you can't find anything about the particular problem you're " +"having, check out our website at www.vidalia-project.net for more " +"support and information. <a name=\"start\"/>" +msgstr "Azpian Tor abiarazterakoan arazo edota jendeak izaten dituen galdera arruntak daude zerrendaturik. Ezin baduzu daukazun arazoaren inguruan ezer aurkitu, joan gure webgunera www.vidalia-project.net helbidean laguntza eta informazio gehiago lortzeko.<a name=\"start\"/>" + +# type: Content of: <html><body><h3> +#: en/troubleshooting.html:25 +msgid "I Can't Start Tor" +msgstr "Ezin dut Tor hasi" + +# type: Content of: <html><body> +#: en/troubleshooting.html:27 +msgid "" +"The most likely reason that Vidalia could not start Tor is because Vidalia " +"is looking for your Tor installation in the wrong directory. You can tell " +"Vidalia where Tor is located by updating the Tor Executable option in" +" the <a href=\"config.html#general\">general configuration settings</a>." +msgstr "Vidaliak Tor abiarazi ezin badu, litekena da Vialiak Toren instalazioa direktorio okerrean bilatzen egotea. Tor non dagoen kokatua Vidaliari esan diezaiokezu Tor Exekutagarria aukera <a href=\"config.html#general\">konfigurazio ezarpen orokorretan</a> eguneratuz." + +# type: Content of: <html><body> +#: en/troubleshooting.html:33 +msgid "" +"Another possible reason that Tor cannot start is because there is already " +"another Tor process running. Check your list of running process and stop the" +" previous Tor process, if you find one. Then, try running Tor again." +msgstr "Tor ezin abiarazteko beste arrazoi posible bat dagoeneko Toren beste prozesu bat martxan egotea da. Egiaztatu zure martxan dauden prozesuen zerrenda eta geldi ezazu aurreko Tor prozesua, baten bat aurkitu ezkero. Ondoren, saiatu Tor berriro abiarazten." + +# type: Content of: <html><body> +#: en/troubleshooting.html:38 +msgid "" +"If that did not help, check your <a href=\"log.html\">message log</a> to see" +" if Tor printed any information about errors it encountered while trying to " +"start." +msgstr "Horrek lagundu ez badu, egiaztatu zure <a href=\"log.html\">mezu erregistroa</a> Torek abiarazten saiatu den bitartean akatsen bat aurkitu duen inguruko informaziorik inprimatu duen ikusteko." + +# type: Content of: <html><body> +#: en/troubleshooting.html:43 +msgid "<a name=\"connect\"/>" +msgstr "<a name=\"connect\"/>" + +# type: Content of: <html><body><h3> +#: en/troubleshooting.html:44 +msgid "Vidalia Can't Connect to Tor" +msgstr "Vidaliak ezin du Torera konektatu" + +# type: Content of: <html><body> +#: en/troubleshooting.html:46 +msgid "" +"Vidalia manages Tor by communicating with it via Tor's control port." +msgstr "Vidaliak Tor kudeatzen du berarekin Toren kontrol portuarekin komunikatuz." + +# type: Content of: <html><body> +#: en/troubleshooting.html:49 +msgid "" +"The most common reason that Vidalia cannot connect to Tor is because Tor " +"started, but encountered an error and exited immediately. You should check " +"your <a href=\"log.html\">message log</a> to see if Tor reported any errors " +"while it started." +msgstr "Vidaliak Torera ezin konektatzeko arrazoi arruntena Torek hasi, baina akatsen bat aurkitu eta berehala irten dela da. Zure <a href=\"log.html\">mezu erregistroa</a> egiaztatu beharko zenuke Torek abiarazterakoan akatsen bat jakinarazi duen ikusteko." + +# type: Content of: <html><body> +#: en/troubleshooting.html:55 +msgid "" +"If Tor is listening on a different port than Vidalia expects, Vidalia will " +"be unable to connect to Tor. You rarely need to change this setting, but if " +"there is another service running on your machine that conflicts with Tor's " +"control port, you will need to specify a different port. You can change this" +" setting in Vidalia's <a href=\"config.html#advanced\">advanced " +"configuration settings</a>." +msgstr "Torek Vidaliak espero duen ataka ezberdin batean entzuten ari bada, Vidaliak ezingo du Torera konektatu. Zu oso gutxitan aldatu beharko duzu ezarpen hau, baina zure ordenagailuan Toren kontrol atakarekin gatazkan dagoen beste zerbitzu bat exekutatzen ari bada, ataka ezberdin bat zehaztu beharko duzu. Ezarpen hau Vidaliaren <a href=\"config.html#advanced\">ezarpen konfigurazio aurreratuan</a> alda dezakezu." + +# type: Content of: <html><body> +#: en/troubleshooting.html:63 +msgid "<a name=\"password\"/>" +msgstr "<a name=\"password\"/>" + +# type: Content of: <html><body><h3> +#: en/troubleshooting.html:64 +msgid "Why is Vidalia asking me for a \"control password\"?" +msgstr "Zergatik eskatzen dit Vidaliak \"kontrol pasahitz\" bat?" + +# type: Content of: <html><body> +#: en/troubleshooting.html:66 +msgid "" +"Vidalia interacts with the Tor software via Tor's \"control port\". The " +"control port lets Vidalia receive status updates from Tor, request a new " +"identity, configure Tor's settings, etc. Each time Vidalia starts Tor, " +"Vidalia sets a random password for Tor's control port to prevent other " +"applications from also connecting to the control port and potentially " +"compromising your anonymity." +msgstr "Vidaliak Tor softwarearekin elkarreragiten du Toren \"kontrol ataka\"ren bitartez. Kontrol atakak Vidaliak Toren egoera eguneraketak jaso, nortasun berria eskatu, Toren ezarpenak konfiguratu etab. dezan baimentzen du. Vidaliak Tor abiarazten duen bakoitzean, Vidaliak ausazko pasahitz bat ezartzen du Toren kontrol atakarentzat, beste aplikazioek ere kontrol atakara konektatzea eragozteko eta zure anonimotasuna arriskuan ez jartzeko." + +# type: Content of: <html><body> +#: en/troubleshooting.html:75 +msgid "" +"Usually this process of generating and setting a random control password " +"happens in the background. There are three common situations, though, where " +"Vidalia may prompt you for a password:" +msgstr "Orokorrean ausazko kontrol pasahitz bat sortu eta ezartzearen prozesu hau atzeko planoan gertatzen da. Hiru egoera arrunt daude, hala ere, zeinetan Vidaliak pasahitz bat eska zaitzake:" + +# type: Content of: <html><body><ul><li> +#: en/troubleshooting.html:82 +msgid "" +"You're already running Vidalia and Tor. For example, this situation can " +"happen if you installed the Vidalia bundle and now you're trying to run the " +"Tor Browser Bundle. In that case, you'll need to close the old Vidalia and " +"Tor before you can run this one." +msgstr "Dagoeneko Vidalia eta Tor exekutatzen ari zara. Adibidez, Vidalia sorta instalatu bazenuen eta orain Tor Browser Bundlea exekutatzen ari bazara egoera hau gerta daiteke. Kasu horretan, Vidalia eta Tor zaharrak itxi beharko dituzu berri hau exekutatu baino lehen." + +# type: Content of: <html><body><ul><li> +#: en/troubleshooting.html:89 +msgid "" +"Vidalia crashed, but left Tor running with the last known random password. " +"After you restart Vidalia, it generates a new random password, but Vidalia " +"can't talk to Tor, because the random passwords are different." +msgstr "Vidaliak huts egin du, baina Tor exekutatzen utzi du azken ausazko pasahitz ezagunarekin. Vidalia berrabiarazten duzun ostean, ausazko pasahitz berri bat sortzen du, baina Vidaliak ezin dio Tori hitz egin, ausazko pasahitzak ezberdinak direlako." + +# type: Content of: <html><body><ul><li> +#: en/troubleshooting.html:94 +msgid "" +"If the dialog that prompts you for a control password has a Reset " +"button, you can click the button and Vidalia will restart Tor with a new " +"random control password." +msgstr "Kontrol pasahitz bat eskatuz agertzen zaizun elkarrizketa-dialogoak Berrezarri botoi bat baldin badu, botoia sakatu dezakezu eta Vidaliak Tor ausazko pasahitz berri batekin berrabiaraziko du." + +# type: Content of: <html><body><ul><li> +#: en/troubleshooting.html:99 +msgid "" +"If you do not see a Reset button, or if Vidalia is unable to restart " +"Tor for you, you can still fix the problem manually. Simply go into your " +"process or task manager, and terminate the Tor process. Then use Vidalia to " +"restart Tor and all will work again." +msgstr "Berrabiarazi botoirik ikusten ez baduzu, edo Vidaliak Tor berrabiarazi ezin badu, eskuz konpondu dezakezu arazoa oraindik. Besterik gabe, zure prozesu edo zeregin kudeatzailera joan eta Tor prozesua amaitu. Ondoren erabili ezazu Vidalia Tor berrabiarazteko eta berriz ondo funtzionatuko du." + +# type: Content of: <html><body><ul><li> +#: en/troubleshooting.html:106 +msgid "" +"You had previously set Tor to run as a service. When Tor is set to run as a " +"service, it starts up when the system boots. If you configured Tor to start " +"as a service through Vidalia, a random password was set and saved in Tor. " +"When you reboot, Tor starts up and uses the random password it saved. You " +"login and start up Vidalia. Vidalia attempts to talk to the already running " +"Tor. Vidalia generates a random password, but it is different than the saved" +" password in the Tor service." +msgstr "Aurrez Tor zerbitzu bat bezala exekutatzeko ezarri duzu. Tor zerbitzu bat bezala exekutatzeko ezartzen denean, sistema abiarazterakoan hasten da. Tor zerbitzu bat bezala hasteko Vidaliaren bitartez konfiguratu baduzu, ausazko pasahitz bat ezarri eta Toren gorde da. Berrabiarazten duzunean, Tor hasten da eta gorde duen ausazko pasahitza erabiltzen du. Saioa hasi eta Vidalia abiarazten duzu. Vidaliak dagoeneko exekutatzen ari den Torekin hitzegiten saiatzen da. Vidaliak ausazko pasahitz bat sortzen du, baina Tor zerbitzuan gordetakoaren ezberdina da." + +# type: Content of: <html><body><ul><li> +#: en/troubleshooting.html:114 +msgid "" +"You need to reconfigure Tor to not be a service. See the Tor wiki page on " +"running <a " +"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\">" +" Tor as a service</a> for more information on how to remove the Tor service." +msgstr "Tor birkonfiguratu behar duzu zerbitzu bat izan ez dadin. Ikusi <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\">Tor zerbitzu bat bezala</a> Tor wiki orria Tor zerbitzua nola kentzeari buruzko informazio gehiagorako." + +# type: Content of: <html><body> +#: en/troubleshooting.html:122 +msgid "<a name=\"torexited\"/>" +msgstr "<a name=\"torexited\"/>" + +# type: Content of: <html><body><h3> +#: en/troubleshooting.html:123 +msgid "Tor Exited Unexpectedly" +msgstr "Tor ustekabean irten da" + +# type: Content of: <html><body> +#: en/troubleshooting.html:125 +msgid "" +"If Tor exits immediately after trying to start, you most likely have another" +" Tor process already running. Check the <a href=\"log.html\">message log</a>" +" to see if any of the last few messages in the list are highlighted in " +"yellow and contain a message similar to the following:" +msgstr "Tor abiarazten saiatzerakoan berehala irtetzen bada, ziurrenik dagoeneko beste Tor prozesu bat exekutatzen izango duzu. Begiratu <a href=\"log.html\">mezu erregistroa</a> ea zerrendako azkenengo mezuek horiz nabarmenduta dauden eta hurrengoaren antzeko mezurik duten:" + +# type: Content of: <html><body><pre> +#: en/troubleshooting.html:131 +#, no-wrap +msgid "" +"connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. \n" +"Is Tor already running?\n" +msgstr "connection_create_listener(): Ezin izan da 127.0.0.1:9050: lotu\nHelbidea jadanik erabiltzen ari da.\nTor oraindik exekutatzen ari da?\n" + +# type: Content of: <html><body> +#: en/troubleshooting.html:135 +msgid "" +"If you find an error message like the one above, you will need to stop the " +"other Tor process before starting a new one with Vidalia. On Windows, you " +"would need to look for tor.exe in your Task Manager. On most other " +"operating systems, the ps command can help you find the other Tor " +"process." +msgstr "Goikoa bezalako akats mezuren bat aurkitzen baduzu, Toren beste prozesua gelditu beharko duzu Vidaliarekin berri bat abiarazi baino lehen. Windowsen, tor.exe bilatu beharko duzu zure Ataza kudeatzailean. Beste sistema eragile gehienetan, ps komandoak Toren beste prozesua bilatzen lagun zaitzake." + +# type: Content of: <html><body> +#: en/troubleshooting.html:141 +msgid "" +"If Tor had been running successfully for awhile (that is, longer than a few " +"seconds), then you should check the <a href=\"log.html\">message log</a> for" +" information about any errors Tor experienced before it exited. Such errors " +"will be highlighted in either red or yellow." +msgstr "Tor denbora batean ongi exekutatzen egon bada (hau da, segundu gutxi batzuk baino gehiago), orduan <a href=\"log.html\">mezu erregistroa</a> begiratu beharko zenuke Torek irten baino lehenago izan dituen akatsei buruzko informazioa lortzeko. Horrelako akatsak gorriz edo horiz nabarmenduta egongo dira." + +# type: Content of: <html><body> +#: en/troubleshooting.html:147 +msgid "<a name=\"stop\"/>" +msgstr "<a name=\"stop\"/>" + +# type: Content of: <html><body><h3> +#: en/troubleshooting.html:148 +msgid "Vidalia Can't Stop Tor" +msgstr "Vidaliak ezin du Tor gelditu" + +# type: Content of: <html><body> +#: en/troubleshooting.html:150 +msgid "" +"If Vidalia cannot stop Tor, you should check your <a " +"href=\"log.html\">message log</a> to see if Tor reported any errors while " +"trying to exit." +msgstr "Vidaliak Tor gelditu ezin badu, zure <a href=\"log.html\">mezu erregistroa</a> ikusi beharko zenuke Torek irtetzen saiatu den bitartean akatsen bat jakinarazi duen egiaztatzeko." [View Less]

1 0

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

05 Feb '13

commit 1b566a5d0a9448920267c833a1caf3280bece756 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 5 16:45:36 2013 +0000 Update translations for vidalia_help --- eu/troubleshooting.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eu/troubleshooting.po b/eu/troubleshooting.po index d018765..a4f44bc 100644 --- a/eu/troubleshooting.po +++ b/eu/troubleshooting.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" … [View More]

1 0

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

05 Feb '13

commit f66d3054933aabc176993086c26a2767c3f03ef4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 5 16:15:56 2013 +0000 Update translations for vidalia_help --- eu/troubleshooting.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eu/troubleshooting.po b/eu/troubleshooting.po index 4245bd8..d018765 100644 --- a/eu/troubleshooting.po +++ b/eu/troubleshooting.po @@ -1,13 +1,13 @@ # # Translators: -# Antxon Baldarra <… [View More]

1 0

[metrics-lib/master] guard-tk actually stands for *weighted* time known.
by karsten＠torproject.org 05 Feb '13

05 Feb '13

commit fdcf0b49a3092da30c5d322aa98c2f03fcf7c488 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Feb 5 15:37:12 2013 +0100 guard-tk actually stands for *weighted* time known. --- .../descriptor/RelayNetworkStatusVote.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/descriptor/RelayNetworkStatusVote.java b/src/org/torproject/descriptor/RelayNetworkStatusVote.java index 98abb14..eb8bf66 100644 --- a/src/org/… [View More]

1 0

[metrics-lib/master] Parse the new flag-thresholds line in votes.
by karsten＠torproject.org 05 Feb '13

05 Feb '13

commit c2a0dbf8bf100a19660ad512b88d93f3d7c18a1e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Feb 5 14:49:28 2013 +0100 Parse the new flag-thresholds line in votes. --- .../descriptor/RelayNetworkStatusVote.java | 41 ++++++++ .../descriptor/impl/NetworkStatusEntryImpl.java | 4 +- .../torproject/descriptor/impl/ParseHelper.java | 26 ++++-- .../impl/RelayNetworkStatusConsensusImpl.java | 8 +- .../impl/RelayNetworkStatusVoteImpl.java … [View More] | 102 +++++++++++++++++++- .../impl/RelayNetworkStatusVoteImplTest.java | 82 ++++++++++++++++ 6 files changed, 246 insertions(+), 17 deletions(-) diff --git a/src/org/torproject/descriptor/RelayNetworkStatusVote.java b/src/org/torproject/descriptor/RelayNetworkStatusVote.java index eda0cef..98abb14 100644 --- a/src/org/torproject/descriptor/RelayNetworkStatusVote.java +++ b/src/org/torproject/descriptor/RelayNetworkStatusVote.java @@ -44,6 +44,47 @@ public interface RelayNetworkStatusVote extends Descriptor { /* Return known relay flags. */ public SortedSet<String> getKnownFlags(); + /* Return the minimum uptime in seconds that this authority requires for + * assigning the Stable flag, or -1 if the authority doesn't report this + * value. */ + public long getStableUptime(); + + /* Return the minimum MTBF (mean time between failure) that this + * authority requires for assigning the Stable flag, or -1 if the + * authority doesn't report this value. */ + public long getStableMtbf(); + + /* Return the minimum bandwidth that this authority requires for + * assigning the Fast flag, or -1 if the authority doesn't report this + * value. */ + public long getFastBandwidth(); + + /* Return the minimum WFU (weighted fractional uptime) in percent that + * this authority requires for assigning the Guard flag, or -1.0 if the + * authority doesn't report this value. */ + public double getGuardWfu(); + + /* Return the minimum time in seconds that this authority needs to know + * about a relay before assigning the Guard flag, or -1 if the authority + * doesn't report this information. */ + public long getGuardTk(); + + /* Return the minimum bandwidth that this authority requires for + * assigning the Guard flag if exits can be guards, or -1 if the + * authority doesn't report this value. */ + public long getGuardBandwidthIncludingExits(); + + /* Return the minimum bandwidth that this authority requires for + * assigning the Guard flag if exits can not be guards, or -1 if the + * authority doesn't report this value. */ + public long getGuardBandwidthExcludingExits(); + + /* Return 1 if the authority has measured enough MTBF info to use the + * MTBF requirement instead of the uptime requirement for assigning the + * Stable flag, 0 if not, or -1 if the authority doesn't report this + * information. */ + public int getEnoughMtbfInfo(); + /* Return consensus parameters. */ public SortedMap<String, Integer> getConsensusParams(); diff --git a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index 121f66e..901e17e 100644 --- a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -149,8 +149,8 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { private void parseWLine(String line, String[] parts) throws DescriptorParseException { this.parsedAtMostOnceKeyword("w"); - SortedMap<String, Integer> pairs = ParseHelper.parseKeyValuePairs( - line, parts, 1, "="); + SortedMap<String, Integer> pairs = + ParseHelper.parseKeyValueIntegerPairs(line, parts, 1, "="); if (pairs.isEmpty()) { throw new DescriptorParseException("Illegal line '" + line + "'."); } diff --git a/src/org/torproject/descriptor/impl/ParseHelper.java b/src/org/torproject/descriptor/impl/ParseHelper.java index 61d1eb0..1b7eff2 100644 --- a/src/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/org/torproject/descriptor/impl/ParseHelper.java @@ -6,6 +6,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.SortedMap; import java.util.TimeZone; import java.util.TreeMap; @@ -182,10 +183,10 @@ public class ParseHelper { return hexString.toUpperCase(); } - public static SortedMap<String, Integer> parseKeyValuePairs(String line, - String[] parts, int startIndex, String separatorString) + public static SortedMap<String, String> parseKeyValueStringPairs( + String line, String[] parts, int startIndex, String separatorString) throws DescriptorParseException { - SortedMap<String, Integer> result = new TreeMap<String, Integer>(); + SortedMap<String, String> result = new TreeMap<String, String>(); for (int i = startIndex; i < parts.length; i++) { String pair = parts[i]; String[] pairParts = pair.split(separatorString); @@ -193,11 +194,22 @@ public class ParseHelper { throw new DescriptorParseException("Illegal key-value pair in " + "line '" + line + "'."); } - String pairName = pairParts[0]; + result.put(pairParts[0], pairParts[1]); + } + return result; + } + + public static SortedMap<String, Integer> parseKeyValueIntegerPairs( + String line, String[] parts, int startIndex, String separatorString) + throws DescriptorParseException { + SortedMap<String, Integer> result = new TreeMap<String, Integer>(); + SortedMap<String, String> keyValueStringPairs = + ParseHelper.parseKeyValueStringPairs(line, parts, startIndex, + separatorString); + for (Map.Entry<String, String> e : keyValueStringPairs.entrySet()) { try { - int pairValue = Integer.parseInt(pairParts[1]); - result.put(pairName, pairValue); - } catch (NumberFormatException e) { + result.put(e.getKey(), Integer.parseInt(e.getValue())); + } catch (NumberFormatException ex) { throw new DescriptorParseException("Illegal value in line '" + line + "'."); } diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java index 35cb316..dad5bc3 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java @@ -257,14 +257,14 @@ public class RelayNetworkStatusConsensusImpl extends NetworkStatusImpl private void parseParamsLine(String line, String[] parts) throws DescriptorParseException { - this.consensusParams = ParseHelper.parseKeyValuePairs(line, parts, 1, - "="); + this.consensusParams = ParseHelper.parseKeyValueIntegerPairs(line, + parts, 1, "="); } private void parseBandwidthWeightsLine(String line, String[] parts) throws DescriptorParseException { - this.bandwidthWeights = ParseHelper.parseKeyValuePairs(line, parts, 1, - "="); + this.bandwidthWeights = ParseHelper.parseKeyValueIntegerPairs(line, + parts, 1, "="); } private String consensusDigest; diff --git a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java index 3695074..c5ba980 100644 --- a/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java +++ b/src/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Scanner; import java.util.Set; import java.util.SortedMap; @@ -48,14 +49,28 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl + "dir-key-certification,directory-signature").split(","))); this.checkExactlyOnceKeywords(exactlyOnceKeywords); Set<String> atMostOnceKeywords = new HashSet<String>(Arrays.asList(( - "client-versions,server-versions,params,contact,legacy-key," - + "dir-key-crosscert,dir-address,directory-footer").split(","))); + "client-versions,server-versions,flag-thresholds,params,contact," + + "legacy-key,dir-key-crosscert,dir-address,directory-footer"). + split(","))); this.checkAtMostOnceKeywords(atMostOnceKeywords); this.checkFirstKeyword("network-status-version"); } protected void parseHeader(byte[] headerBytes) throws DescriptorParseException { + /* Initialize flag-thresholds values here for the case that the vote + * doesn't contain those values. Initializing them in the constructor + * or when declaring variables wouldn't work, because those parts are + * evaluated later and would overwrite everything we parse here. */ + this.stableUptime = -1L; + this.stableMtbf = -1L; + this.fastBandwidth = -1L; + this.guardWfu = -1.0; + this.guardTk = -1L; + this.guardBandwidthIncludingExits = -1L; + this.guardBandwidthExcludingExits = -1L; + this.enoughMtbfInfo = -1; + Scanner s = new Scanner(new String(headerBytes)).useDelimiter("\n"); boolean skipCrypto = false; /* TODO Parse crypto parts. */ while (s.hasNext()) { @@ -84,6 +99,8 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl this.parseServerVersionsLine(line, parts); } else if (keyword.equals("known-flags")) { this.parseKnownFlagsLine(line, parts); + } else if (keyword.equals("flag-thresholds")) { + this.parseFlagThresholdsLine(line, parts); } else if (keyword.equals("params")) { this.parseParamsLine(line, parts); } else if (keyword.equals("dir-source")) { @@ -247,10 +264,47 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl } } + private void parseFlagThresholdsLine(String line, String[] parts) + throws DescriptorParseException { + if (parts.length < 2) { + throw new DescriptorParseException("No flag thresholds in line '" + + line + "'."); + } + SortedMap<String, String> flagThresholds = + ParseHelper.parseKeyValueStringPairs(line, parts, 1, "="); + try { + for (Map.Entry<String, String> e : flagThresholds.entrySet()) { + if (e.getKey().equals("stable-uptime")) { + this.stableUptime = Long.parseLong(e.getValue()); + } else if (e.getKey().equals("stable-mtbf")) { + this.stableMtbf = Long.parseLong(e.getValue()); + } else if (e.getKey().equals("fast-speed")) { + this.fastBandwidth = Long.parseLong(e.getValue()); + } else if (e.getKey().equals("guard-wfu")) { + this.guardWfu = Double.parseDouble(e.getValue(). + replaceAll("%", "")); + } else if (e.getKey().equals("guard-tk")) { + this.guardTk = Long.parseLong(e.getValue()); + } else if (e.getKey().equals("guard-bw-inc-exits")) { + this.guardBandwidthIncludingExits = + Long.parseLong(e.getValue()); + } else if (e.getKey().equals("guard-bw-exc-exits")) { + this.guardBandwidthExcludingExits = + Long.parseLong(e.getValue()); + } else if (e.getKey().equals("enough-mtbf")) { + this.enoughMtbfInfo = Integer.parseInt(e.getValue()); + } + } + } catch (NumberFormatException ex) { + throw new DescriptorParseException("Illegal value in line '" + + line + "'."); + } + } + private void parseParamsLine(String line, String[] parts) throws DescriptorParseException { - this.consensusParams = ParseHelper.parseKeyValuePairs(line, parts, 1, - "="); + this.consensusParams = ParseHelper.parseKeyValueIntegerPairs(line, + parts, 1, "="); } private void parseDirSourceLine(String line, String[] parts) @@ -465,6 +519,46 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl return new TreeSet<String>(this.knownFlags); } + private long stableUptime; + public long getStableUptime() { + return this.stableUptime; + } + + private long stableMtbf; + public long getStableMtbf() { + return this.stableMtbf; + } + + private long fastBandwidth; + public long getFastBandwidth() { + return this.fastBandwidth; + } + + private double guardWfu; + public double getGuardWfu() { + return this.guardWfu; + } + + private long guardTk; + public long getGuardTk() { + return this.guardTk; + } + + private long guardBandwidthIncludingExits; + public long getGuardBandwidthIncludingExits() { + return this.guardBandwidthIncludingExits; + } + + private long guardBandwidthExcludingExits; + public long getGuardBandwidthExcludingExits() { + return this.guardBandwidthExcludingExits; + } + + private int enoughMtbfInfo; + public int getEnoughMtbfInfo() { + return this.enoughMtbfInfo; + } + private SortedMap<String, Integer> consensusParams; public SortedMap<String, Integer> getConsensusParams() { return this.consensusParams == null ? null: diff --git a/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java b/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java index 7fbdb7d..b3fbcfd 100644 --- a/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java +++ b/test/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java @@ -115,6 +115,17 @@ public class RelayNetworkStatusVoteImplTest { vb.knownFlagsLine = line; return new RelayNetworkStatusVoteImpl(vb.buildVote(), true); } + private String flagThresholdsLine = "flag-thresholds " + + "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"; + private static RelayNetworkStatusVote + createWithFlagThresholdsLine(String line) + throws DescriptorParseException { + VoteBuilder vb = new VoteBuilder(); + vb.flagThresholdsLine = line; + return new RelayNetworkStatusVoteImpl(vb.buildVote(), true); + } private String paramsLine = "params " + "CircuitPriorityHalflifeMsec=30000 bwauthbestratio=1 " + "bwauthcircs=1 bwauthdescbw=0 bwauthkp=10000 bwauthpid=1 " @@ -388,6 +399,9 @@ public class RelayNetworkStatusVoteImplTest { if (this.knownFlagsLine != null) { sb.append(this.knownFlagsLine + "\n"); } + if (this.flagThresholdsLine != null) { + sb.append(this.flagThresholdsLine + "\n"); + } if (this.paramsLine != null) { sb.append(this.paramsLine + "\n"); } @@ -749,6 +763,74 @@ public class RelayNetworkStatusVoteImplTest { VoteBuilder.createWithKnownFlagsLine("known-flags "); } + @Test() + public void testFlagThresholdsLine() throws DescriptorParseException { + VoteBuilder vb = new VoteBuilder(); + RelayNetworkStatusVote vote = + new RelayNetworkStatusVoteImpl(vb.buildVote(), true); + assertEquals(693369L, vote.getStableUptime()); + assertEquals(153249L, vote.getStableMtbf()); + assertEquals(40960L, vote.getFastBandwidth()); + assertEquals(94.669, vote.getGuardWfu(), 0.001); + assertEquals(691200L, vote.getGuardTk()); + assertEquals(174080L, vote.getGuardBandwidthIncludingExits()); + assertEquals(184320L, vote.getGuardBandwidthExcludingExits()); + assertEquals(1, vote.getEnoughMtbfInfo()); + } + + @Test() + public void testFlagThresholdsNoLine() throws DescriptorParseException { + RelayNetworkStatusVote vote = + VoteBuilder.createWithFlagThresholdsLine(null); + assertEquals(-1L, vote.getStableUptime()); + assertEquals(-1L, vote.getStableMtbf()); + assertEquals(-1L, vote.getFastBandwidth()); + assertEquals(-1.0, vote.getGuardWfu(), 0.001); + assertEquals(-1L, vote.getGuardTk()); + assertEquals(-1L, vote.getGuardBandwidthIncludingExits()); + assertEquals(-1L, vote.getGuardBandwidthExcludingExits()); + assertEquals(-1, vote.getEnoughMtbfInfo()); + } + + @Test() + public void testFlagThresholdsAllZeroes() + throws DescriptorParseException { + RelayNetworkStatusVote vote = + VoteBuilder.createWithFlagThresholdsLine("flag-thresholds " + + "stable-uptime=0 stable-mtbf=0 fast-speed=0 guard-wfu=0.0% " + + "guard-tk=0 guard-bw-inc-exits=0 guard-bw-exc-exits=0 " + + "enough-mtbf=0"); + assertEquals(0L, vote.getStableUptime()); + assertEquals(0L, vote.getStableMtbf()); + assertEquals(0L, vote.getFastBandwidth()); + assertEquals(0.0, vote.getGuardWfu(), 0.001); + assertEquals(0L, vote.getGuardTk()); + assertEquals(0L, vote.getGuardBandwidthIncludingExits()); + assertEquals(0L, vote.getGuardBandwidthExcludingExits()); + assertEquals(0, vote.getEnoughMtbfInfo()); + } + + @Test(expected = DescriptorParseException.class) + public void testFlagThresholdsNoSpace() + throws DescriptorParseException { + VoteBuilder.createWithFlagThresholdsLine("flag-thresholds"); + } + + @Test(expected = DescriptorParseException.class) + public void testFlagThresholdsOneSpace() + throws DescriptorParseException { + VoteBuilder.createWithFlagThresholdsLine("flag-thresholds "); + } + + @Test(expected = DescriptorParseException.class) + public void testFlagThresholdDuplicate() + throws DescriptorParseException { + VoteBuilder vb = new VoteBuilder(); + vb.flagThresholdsLine = vb.flagThresholdsLine + "\n" + + vb.flagThresholdsLine; + new RelayNetworkStatusVoteImpl(vb.buildVote(), true); + } + @Test(expected = DescriptorParseException.class) public void testNicknameMissing() throws DescriptorParseException { VoteBuilder.createWithDirSourceLine("dir-source " [View Less]

1 0

[torbrowser/master] OSX: use make package to get Firefox's omni.ja
by erinn＠torproject.org 05 Feb '13

05 Feb '13

commit 22c493a03ebc440dc6c16c08455053c322afd16b Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Feb 5 14:51:39 2013 +0100 OSX: use make package to get Firefox's omni.ja --- build-scripts/osx-alpha.mk | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 8e339f7..95dc973 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -129,11 +129,12 @@ build-firefox: $(FIREFOX_DIR) … [View More]

1 0