- tor-commits - lists.torproject.org

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 28 Apr '12

28 Apr '12

commit 015742f6fd8fa0144be748adbfbc532591a4dfdc Merge: 0c4d7fc 4c8d568 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Apr 28 10:51:36 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)

1 0

r25629: {website} bump tbbs for firefox 12 and add vietnamese and korean (in website/trunk: . include projects/en)
by Erinn Clark 28 Apr '12

28 Apr '12

Author: erinn Date: 2012-04-28 13:38:52 +0000 (Sat, 28 Apr 2012) New Revision: 25629 Modified: website/trunk/include/versions.wmi website/trunk/projects/en/torbrowser.wml website/trunk/publish Log: bump tbbs for firefox 12 and add vietnamese and korean Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-04-26 17:10:57 UTC (rev 25628) +++ website/trunk/include/versions.wmi 2012-04-28 13:38:52 UTC (rev 25629) @@ -27,10 +27,10 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.35</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.12-alpha</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.35-8</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.35-9</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.17-stable, zlib-1.2.6, openssl-1.0.0h</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>11.0</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.18-stable, zlib-1.2.6, openssl-1.0.1b</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>12.0</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> @@ -38,20 +38,20 @@ <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> <define-tag version-torbrowserbundlealpha whitespace=delete>2.3.12-alpha-2</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.35-9</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-9</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.35-10</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.35-10</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> -<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.17-stable, zlib-1.2.6, openssl-1.0.0h</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>11.0</define-tag> +<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.18-stable, zlib-1.2.6, openssl-1.0.1b</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>12.0</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.17</define-tag> <define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.3.12-alpha-2</define-tag> <define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.3.12-alpha-2</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-8</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-8</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.35-9</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.35-9</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.35</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>11.0</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>12.0</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.5.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.17</define-tag> <define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.3.12-alpha-2</define-tag> Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2012-04-26 17:10:57 UTC (rev 25628) +++ website/trunk/projects/en/torbrowser.wml 2012-04-28 13:38:52 UTC (rev 25629) @@ -125,8 +125,14 @@ (it)</a> (<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_it.exe.asc" style="font-size: 90%;">signature</a>)</li> - + <li><a + href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ko.exe">Korean + (ko)</a> (<a + href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_ko.exe.asc" + style="font-size: 90%;">signature</a>)</li> + + <li><a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_nl.exe">Nederlands (nl)</a> (<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_nl.exe.asc" @@ -246,9 +252,19 @@ href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-it.zip.asc" style="font-size: 90%;">signature</a>)</li> - <li>Nederlands (nl):<a - href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-nl.zip">32-bit</a> + <li>Korean (ko):<a + href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ko.zip">32-bit</a> (<a + href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-ko.zip.asc" + style="font-size: 90%;">signature</a>) | <a + href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ko.zip">64-bit</a> + (<a + href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ko.zip.asc" + style="font-size: 90%;">signature</a>)</li> + + + <li>Nederlands (nl):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-nl.zip">32-bit</a> + (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-nl.zip.asc" style="font-size: 90%;">signature</a>) | <a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-nl.zip">64-bit</a> @@ -287,6 +303,15 @@ href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-ru.zip.asc" style="font-size: 90%;">signature</a>)</li> + <li>Vietnamese (vi):<a + href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-vi.zip">32-bit</a> + (<a + href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-vi.zip.asc" + style="font-size: 90%;">signature</a>) | <a + href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-vi.zip">64-bit</a> + (<a + href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx64>-osx-x86_64-vi.zip.asc" style="font-size: 90%;">signature</a>)</li> + <li>简体字 (zh-CN):<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32>-osx-i386-zh-CN.zip">32-bit</a> (<a @@ -376,7 +401,18 @@ (<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-it.tar.gz.asc" style="font-size: 90%;">signature</a>)</li> + + <li>Korean (ko): <a + href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ko.tar.gz">32-bit</a> + (<a + href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-ko.tar.gz.asc" + style="font-size: 90%;">signature</a>) | <a + href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ko.tar.gz">64-bit</a> + (<a + href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ko.tar.gz.asc" + style="font-size: 90%;">signature</a>)</li> + <li>Nederlands (nl): <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-nl.tar.gz">32-bit</a> (<a @@ -417,7 +453,17 @@ (<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-ru.tar.gz.asc" style="font-size: 90%;">signature</a>)</li> - + + <li>Vietnamese (vi): <a + href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-vi.tar.gz">32-bit</a> + (<a + href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-vi.tar.gz.asc" + style="font-size: 90%;">signature</a>) | <a + href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-vi.tar.gz">64-bit</a> + (<a + href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-vi.tar.gz.asc" + style="font-size: 90%;">signature</a>)</li> + <li>简体字 (zh-CN): <a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-zh-CN.tar.gz">32-bit</a> (<a Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2012-04-26 17:10:57 UTC (rev 25628) +++ website/trunk/publish 2012-04-28 13:38:52 UTC (rev 25629) @@ -29,10 +29,10 @@ --exclude releases \ --exclude torbutton-current.xpi \ --exclude project \ - -Prvz --delete . www-master.torproject.org:/srv/www-master.torproject.org/htdocs + -Prvz --delete . vescum:/srv/www-master.torproject.org/htdocs echo "Forcing mirror update" -ssh www-master.torproject.org ' +ssh vescum ' ( find /srv/www-master.torproject.org/htdocs ! -perm -444 -print0 | xargs -0 --no-run-if-empty chmod -v a+r || ( echo >&2 "There are unreadable files in /srv/www-master.torproject.org/htdocs, not triggering mirror run."; exit 1)

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 28 Apr '12

28 Apr '12

commit 9c71cb381104fd1f1bff7ccb5a330e6fb1d1b30f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 28 09:45:29 2012 +0000 Update translations for https_everywhere --- hu/ssl-observatory.dtd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hu/ssl-observatory.dtd b/hu/ssl-observatory.dtd index af99f10..f0396db 100644 --- a/hu/ssl-observatory.dtd +++ b/hu/ssl-observatory.dtd @@ -86,4 +86,4 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.prefs.self_signed "A használt önaláírt tanúsítványok feltöltése és ellenőrzése"> <!ENTITY ssl-observatory.prefs.self_signed_tooltip -""> +"Ez ajánlott; a kriptográfiai problémák széles körben elterjedtek az önaláírt tanúsítvánnyal ellátott céleszközöknél.">

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 28 Apr '12

28 Apr '12

commit 1f9c641848fa64b784b69142fc9ea69830e07aa7 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 28 09:45:13 2012 +0000 Update translations for vidalia_alpha --- hu/vidalia_hu.po | 50 +++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/hu/vidalia_hu.po b/hu/vidalia_hu.po index d7c83f4..f87668b 100644 --- a/hu/vidalia_hu.po +++ b/hu/vidalia_hu.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-04-21 11:44+0000\n" +"PO-Revision-Date: 2012-04-28 09:22+0000\n" "Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2517,7 +2517,7 @@ msgstr "Állapot" msgctxt "NetViewer" msgid "<a href=\"server.offline\">Why is my relay offline?</a>" -msgstr "" +msgstr "<a href=\"server.offline\">Miért nincs csatlakozva az Elosztóm?</a>" msgctxt "NetViewer" msgid "" @@ -2675,11 +2675,11 @@ msgstr "HTTP / HTTPS" msgctxt "NetworkPage" msgid "You must specify one or more bridges." -msgstr "" +msgstr "Meg kell adnia egy vagy több hidat." msgctxt "PluginEngine" msgid "WARNING: %1 doesn't have an info file." -msgstr "" +msgstr "FGIYELEM: %1 nem rendelkezik info fájllal." msgctxt "PluginWrapper" msgid "%1: Processing..." @@ -2689,7 +2689,7 @@ msgctxt "PluginWrapper" msgid "" "%4: ERROR: Line: %1 - Column: %2\n" "%3" -msgstr "" +msgstr "%4: HIBA: Sor: %1 - Oszlop: %2\n%3" msgctxt "PluginWrapper" msgid "%1: Error opening file %2" @@ -2701,7 +2701,7 @@ msgstr "%2: HIBA: %1 nem megnyitható" msgctxt "PluginWrapper" msgid "%2: ERROR: Parsing %1" -msgstr "" +msgstr "%2: HIBA: %1 értelmezése" msgctxt "PluginWrapper" msgid "" @@ -2729,7 +2729,7 @@ msgstr "" msgctxt "PluginWrapper" msgid "*** Backtrace:" -msgstr "" +msgstr "*** Visszakövetés:" msgctxt "PluginWrapper" msgid "(untitled)" @@ -2737,7 +2737,7 @@ msgstr "(névtelen)" msgctxt "PluginWrapper" msgid "Error: buildGUI() failed for plugin %1" -msgstr "" +msgstr "Hiba: buildGUI() sikertelen a %1 bővítményhez" msgctxt "Policy" msgid "accept" @@ -2759,7 +2759,7 @@ msgctxt "QObject" msgid "" "Failed to set %1:\n" "Reason: %2" -msgstr "" +msgstr "Sikertelen a %1 beállítása:\nOk: %2" msgctxt "QObject" msgid "" @@ -2775,7 +2775,7 @@ msgstr "" msgctxt "QObject" msgid "Vidalia was unable to save the options to the torrc file." -msgstr "" +msgstr "A Vidalia nem tudta lementeni a beállításokat a torrc fájlba." msgctxt "RouterDescriptor" msgid "Online" @@ -3209,23 +3209,23 @@ msgstr "Email cím amin elérhető, ha probléma van az Ön elosztójával. Mega msgctxt "ServerPage" msgid "day" -msgstr "" +msgstr "nap" msgctxt "ServerPage" msgid "week" -msgstr "" +msgstr "hét" msgctxt "ServerPage" msgid "month" -msgstr "" +msgstr "hónap" msgctxt "ServerPage" msgid "Enable accounting" -msgstr "" +msgstr "Összegzés engedélyezése" msgctxt "ServerPage" msgid "h:mm" -msgstr "" +msgstr "ó:pp" msgctxt "ServerPage" msgid "at" @@ -3237,31 +3237,31 @@ msgstr "" msgctxt "ServerPage" msgid "bytes" -msgstr "" +msgstr "bájt" msgctxt "ServerPage" msgid "KB" -msgstr "" +msgstr "KB" msgctxt "ServerPage" msgid "MB" -msgstr "" +msgstr "MB" msgctxt "ServerPage" msgid "GB" -msgstr "" +msgstr "GB" msgctxt "ServerPage" msgid "TB" -msgstr "" +msgstr "TB" msgctxt "ServerPage" msgid "Push no more than" -msgstr "" +msgstr "Ne küldje el " msgctxt "ServerPage" msgid "time" -msgstr "" +msgstr "alkalomnál többször." msgctxt "StatusEventWidget" msgid "Copy to Clipboard" @@ -3568,15 +3568,15 @@ msgstr "A Vidalia nem indította el a Tor-t. Le kell állítania a Tor-t azon a msgctxt "TorControl" msgid "Start failed: %1" -msgstr "" +msgstr "Indítás sikertelen: %1" msgctxt "TorControl" msgid "Process finished: ExitCode=%1" -msgstr "" +msgstr "Folyamat leállt: ExitCode=%1" msgctxt "TorControl" msgid "Connection failed: %1" -msgstr "" +msgstr "Csatlakozás sikertelen: %1" msgctxt "TorControl" msgid "Disconnected"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 28 Apr '12

28 Apr '12

commit 170e2031d7ac3ffb95e43c0fa656424bc5405c3f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 28 09:15:34 2012 +0000 Update translations for https_everywhere_completed --- nl/ssl-observatory.dtd | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/nl/ssl-observatory.dtd b/nl/ssl-observatory.dtd index 2ee0b30..8740185 100644 --- a/nl/ssl-observatory.dtd +++ b/nl/ssl-observatory.dtd @@ -92,4 +92,7 @@ het DNS-systeem zijn op te lossen."> <!ENTITY ssl-observatory.warning.text "Het SSL-observatorium van EFF heeft een waarschuwing uitgegeven over een HTTPS-certificaat voor deze site:"> <!ENTITY ssl-observatory.warning.defense "Als u bent ingelogd op deze site, is het aan te raden uw wachtwoord te wijzigen zodra u een veilige verbinding hebt."> - +<!ENTITY ssl-observatory.prefs.self_signed +"Verstuur en controleer zelf-getekende certificaten"> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +"Dit is aanbevolen; cryptografische problemen zijn veel voorkomend in zelf-getekende embedded apparaten">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 28 Apr '12

28 Apr '12

commit 2b83cc00cceffd57705685cbb4459c42c6d2abb7 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 28 09:15:29 2012 +0000 Update translations for https_everywhere --- hu/ssl-observatory.dtd | 7 +++++-- nl/ssl-observatory.dtd | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hu/ssl-observatory.dtd b/hu/ssl-observatory.dtd index 228c6a5..af99f10 100644 --- a/hu/ssl-observatory.dtd +++ b/hu/ssl-observatory.dtd @@ -27,7 +27,10 @@ to turn it on?">--> "Küldje be és ellenőrizze azon tanúsítványokat, amelyek nem standard tanúsítványkiadótól származnak"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip -""> +"Biztonságos (és javasolt) ha bekapcsolja ezt az opciót, kivéve ha nagyon figyelt vállalati hálózatról vagy Kaspersky víruskereső szoftvert használ, ami figyeli a böngészést egy TLS proxy-val, és egy helyi tanúsítványkiadóval. +Ha bekapcsolja, az az opció nyomokat hagyhat arról, hogy mely https:// oldalakor látogatott meg azon a proxy-n keresztül, mert egyedi tanúsítványokat hoz létre. +Tehát hagyja kikapcsolva alapértelmezetten. +"> <!ENTITY ssl-observatory.prefs.anonymous "A tanúsítványok ellenőrzése Tor-on keresztül az anonimitás megőrzéséhez."> <!ENTITY ssl-observatory.prefs.anonymous_unavailable @@ -81,6 +84,6 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.warning.defense "Ha belépett erre az oldalra, ha már biztonságos kapcsolattal rendelkezik, hogy lecserélje a jelszavát."> <!ENTITY ssl-observatory.prefs.self_signed -""> +"A használt önaláírt tanúsítványok feltöltése és ellenőrzése"> <!ENTITY ssl-observatory.prefs.self_signed_tooltip ""> diff --git a/nl/ssl-observatory.dtd b/nl/ssl-observatory.dtd index db1413e..8740185 100644 --- a/nl/ssl-observatory.dtd +++ b/nl/ssl-observatory.dtd @@ -93,6 +93,6 @@ het DNS-systeem zijn op te lossen."> <!ENTITY ssl-observatory.warning.defense "Als u bent ingelogd op deze site, is het aan te raden uw wachtwoord te wijzigen zodra u een veilige verbinding hebt."> <!ENTITY ssl-observatory.prefs.self_signed -""> +"Verstuur en controleer zelf-getekende certificaten"> <!ENTITY ssl-observatory.prefs.self_signed_tooltip -""> +"Dit is aanbevolen; cryptografische problemen zijn veel voorkomend in zelf-getekende embedded apparaten">

1 0

[arm/master] Lowering unrecognized event type logging to INFO
by atagar＠torproject.org 27 Apr '12

27 Apr '12

commit b2f278f33492ad41f5208479a0f37a96c898b395 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 26 20:21:13 2012 -0700 Lowering unrecognized event type logging to INFO Unrecognized event types are neither important nor something that a user can be expected to fix. Actually, it's an issue for the controller library (torctl or stem). Dropping these below the default runlevel. Arm is currently complaining about SIGNAL and CONF_CHANGED not being recognized. If torctl doesn't add support for these then this won't be addressed until our move to stem. --- armrc.sample | 2 +- src/cli/controller.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/armrc.sample b/armrc.sample index 7a611c0..c38bcfc 100644 --- a/armrc.sample +++ b/armrc.sample @@ -277,7 +277,7 @@ log.torGetInfoCache NONE log.torGetConf DEBUG log.torGetConfCache NONE log.torSetConf INFO -log.torEventTypeUnrecognized NOTICE +log.torEventTypeUnrecognized INFO log.torPrefixPathInvalid NOTICE log.procCallMade DEBUG log.sysCallMade DEBUG diff --git a/src/cli/controller.py b/src/cli/controller.py index 4bef5ec..c46911c 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -45,7 +45,7 @@ CONFIG = {"startup.events": "N3", "features.graph.bw.prepopulate": True, "wizard.default": {}, "log.startTime": log.INFO, - "log.torEventTypeUnrecognized": log.NOTICE, + "log.torEventTypeUnrecognized": log.INFO, "log.configEntryUndefined": log.NOTICE, "log.unknownTorPid": log.WARN}

1 0

[arm/master] Giving users a notice when DisableDebuggerAttachment is set
by atagar＠torproject.org 27 Apr '12

27 Apr '12

commit a386d65d1e70719bb476b6a7c68d8f9f3e59b254 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 27 09:32:19 2012 -0700 Giving users a notice when DisableDebuggerAttachment is set Ugg this feature is a pita. Giving the user a notice that it'll break the system utilities that arm relies on, telling them how to disable it and where to go for more information. --- src/cli/controller.py | 38 +++++++++++++++++++++++--------------- 1 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index c46911c..c1be694 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -663,23 +663,31 @@ def startTorMonitor(startTime): torTools.REQ_EVENTS["BW"] = "bandwidth graph won't function" if not CONFIG["startup.blindModeEnabled"]: - torTools.REQ_EVENTS["CIRC"] = "may cause issues in identifying client connections" + # The DisableDebuggerAttachment will prevent our connection panel from really + # functioning. It'll have circuits, but little else. If this is the case then + # notify the user and tell them what they can do to fix it. - # Configures connection resoultions. This is paused/unpaused according to - # if Tor's connected or not. - conn.addStatusListener(connResetListener) - - if torPid: - # use the tor pid to help narrow connection results - torCmdName = sysTools.getProcessName(torPid, "tor") - connections.getResolver(torCmdName, torPid, "tor") + if conn.getOption("DisableDebuggerAttachment") == "1": + log.log(log.NOTICE, "Tor is preventing system utilities like netstat and lsof from working. This means that arm can't provide you with connection information. You can change this by adding 'DisableDebuggerAttachment 0' to your torrc and restarting tor. For more information see...\nhttps://trac.torproject.org/3313") + connections.getResolver("tor").setPaused(True) else: - # constructs singleton resolver and, if tor isn't connected, initizes - # it to be paused - connections.getResolver("tor").setPaused(not conn.isAlive()) - - # hack to display a better (arm specific) notice if all resolvers fail - connections.RESOLVER_FINAL_FAILURE_MSG = "We were unable to use any of your system's resolvers to get tor's connections. This is fine, but means that the connections page will be empty. This is usually permissions related so if you would like to fix this then run arm with the same user as tor (ie, \"sudo -u <tor user> arm\")." + torTools.REQ_EVENTS["CIRC"] = "may cause issues in identifying client connections" + + # Configures connection resoultions. This is paused/unpaused according to + # if Tor's connected or not. + conn.addStatusListener(connResetListener) + + if torPid: + # use the tor pid to help narrow connection results + torCmdName = sysTools.getProcessName(torPid, "tor") + connections.getResolver(torCmdName, torPid, "tor") + else: + # constructs singleton resolver and, if tor isn't connected, initizes + # it to be paused + connections.getResolver("tor").setPaused(not conn.isAlive()) + + # hack to display a better (arm specific) notice if all resolvers fail + connections.RESOLVER_FINAL_FAILURE_MSG = "We were unable to use any of your system's resolvers to get tor's connections. This is fine, but means that the connections page will be empty. This is usually permissions related so if you would like to fix this then run arm with the same user as tor (ie, \"sudo -u <tor user> arm\")." # provides a notice about any event types tor supports but arm doesn't missingEventTypes = cli.logPanel.getMissingEventTypes()

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 0c4d7fc9d5dcb3d2e5c7053b4e4b0d8098a4f4e4 Merge: d4b7a1f 7945762 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 27 13:34:56 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 | 10 +++++----- README.OSX-2.2 | 10 +++++----- README.WIN-2.2 | 10 +++++----- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 16 ++++++++++++++++ changelog.osx-2.2 | 19 +++++++++++++++++++ changelog.windows-2.2 | 16 ++++++++++++++++ 10 files changed, 72 insertions(+), 21 deletions(-)

1 0

[torbrowser/master] bump all tbbs for firefox 12
by erinn＠torproject.org 27 Apr '12

27 Apr '12

commit 7945762f80c94e8e2ee611e0e5c1b76fc113cd41 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Apr 27 13:34:27 2012 -0300 bump all tbbs for firefox 12 --- README.LINUX-2.2 | 10 +++++----- README.OSX-2.2 | 10 +++++----- README.WIN-2.2 | 10 +++++----- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 16 ++++++++++++++++ changelog.osx-2.2 | 19 +++++++++++++++++++ changelog.windows-2.2 | 16 ++++++++++++++++ 10 files changed, 72 insertions(+), 21 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index beef2e1..f6b803a 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,12 +4,12 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.17 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0h) -Firefox 11.0 +Vidalia 0.2.17 (with Qt 4.8.1) +Tor 0.2.2.35 (with libevent-2.0.18-stable, zlib-1.2.6 and openssl-1.0.1b) +Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.3.4 - |_ HTTPS-Everywhere 2.0.1 + |_ NoScript 2.3.9 + |_ HTTPS-Everywhere 2.0.2 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 01fdcf6..ccb11c1 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -4,12 +4,12 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.17 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0h) -Firefox 11.0 +Vidalia 0.2.17 (with Qt 4.8.1) +Tor 0.2.2.35 (with libevent-2.0.18-stable, zlib-1.2.6 and openssl-1.0.1b) +Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.3.4 - |_ HTTPS-Everywhere 2.0.1 + |_ NoScript 2.3.9 + |_ HTTPS-Everywhere 2.0.2 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index d2516ac..bb9c1b8 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -4,12 +4,12 @@ Tor Browser Bundle for Windows Included applications --------------------- -Vidalia 0.2.17 (with Qt 4.7.4) -Tor 0.2.2.35 (with libevent-2.0.17-stable, zlib-1.2.6 and openssl-1.0.0h) -Firefox 11.0 +Vidalia 0.2.17 (with Qt 4.8.1) +Tor 0.2.2.35 (with libevent-2.0.18-stable, zlib-1.2.6 and openssl-1.0.1b) +Firefox 12.0 \_ Torbutton 1.4.5.1 - |_ NoScript 2.3.4 - |_ HTTPS-Everywhere 2.0.1 + |_ NoScript 2.3.9 + |_ HTTPS-Everywhere 2.0.2 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index dec0294..86adbc5 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=9 +BUILD_NUM=10 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index d7af26c..bbefe9a 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=8 +BUILD_NUM=9 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index e5afa00..aeebee7 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -7,15 +7,15 @@ OPENSSL_VER=1.0.1b LIBPNG_VER=1.5.10 QT_VER=4.8.1 VIDALIA_VER=0.2.17 -LIBEVENT_VER=2.0.17-stable +LIBEVENT_VER=2.0.18-stable TOR_VER=0.2.2.35 PIDGIN_VER=2.6.4 FIREFOX_VER=12.0 MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.5.1 -NOSCRIPT_VER=2.3.4 -HTTPSEVERYWHERE_VER=2.0.1 +NOSCRIPT_VER=2.3.9 +HTTPSEVERYWHERE_VER=2.0.2 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.1 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 26075ca..200d6d2 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=8 +BUILD_NUM=9 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 9adf7aa..7dcf7ef 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,19 @@ +Tor Browser Bundle (2.2.35-10); suite=linux + + * Update Firefox to 12.0 + * Update OpenSSL to 1.0.1b + * Update Libevent to 2.0.18-stable + * Update Qt to 4.8.1 + * Update Libpng to 1.5.10 + * Update HTTPS Everywhere to 2.0.2 + * Update NoScript to 2.3.9 + * Rebrand Firefox to TorBrowser (closes: #2176) + * New Firefox patches + - Make Download Manager memory-only (closes: #4017) + - Add DuckDuckGo and Startpage to Omnibox (closes: #4902) + + -- Erinn Clark <erinn(a)torproject.org> Fri Apr 27 12:43:35 BRT 2012 + Tor Browser Bundle (2.2.35-9); suite=linux * Fix launch script to prevent Vidalia from running in debug mode all the diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index ab5f160..667e890 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,22 @@ +Tor Browser Bundle (2.2.35-9); suite=osx + + * Update Firefox to 12.0 + * Update OpenSSL to 1.0.1b + * Update Libevent to 2.0.18-stable + * Update Qt to 4.8.1 + * Update Libpng to 1.5.10 + * Update HTTPS Everywhere to 2.0.2 + * Update NoScript to 2.3.9 + * Rebrand Firefox to TorBrowser (closes: #2176) + * New Firefox patches + - Make Download Manager memory-only (closes: #4017) + - Add DuckDuckGo and Startpage to Omnibox (closes: #4902) + - Add Steven Michaud's OS X crash fix patch. It doesn't fix #5021 but will + hopefully help us debug further. See also: + https://bugzilla.mozilla.org/show_bug.cgi?id=715885#c35 + + -- Erinn Clark <erinn(a)torproject.org> Fri Apr 27 12:43:23 BRT 2012 + Tor Browser Bundle (2.2.35-8); suite=osx * Update Firefox to 11.0 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 4f015fb..13cf36f 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,19 @@ +Tor Browser Bundle (2.2.35-9); suite=windows + + * Update Firefox to 12.0 + * Update OpenSSL to 1.0.1b + * Update Libevent to 2.0.18-stable + * Update Qt to 4.8.1 + * Update Libpng to 1.5.10 + * Update HTTPS Everywhere to 2.0.2 + * Update NoScript to 2.3.9 + * Rebrand Firefox to TorBrowser (closes: #2176) + * New Firefox patches + - Make Download Manager memory-only (closes: #4017) + - Add DuckDuckGo and Startpage to Omnibox (closes: #4902) + + -- Erinn Clark <erinn(a)torproject.org> Fri Apr 27 12:43:33 BRT 2012 + Tor Browser Bundle (2.2.35-8); suite=windows * Update Firefox to 11.0

1 0