- tor-commits - lists.torproject.org

[pytorctl/master] Bug #4097: Clear old last_exit before requesting a new one
by mikeperry＠torproject.org 19 Oct '11

19 Oct '11

commit e15ed99df8e8e04cadd0f3792e42a621df6fbe02 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Oct 19 16:32:34 2011 -0700 Bug #4097: Clear old last_exit before requesting a new one Should eliminate the keyerror in the test's node_map, which seemed to be due to really stale last_exits laying around from previous tests on a different consensus. --- ScanSupport.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ScanSupport.py b/ScanSupport.py index 8985fd7..e6752c5 100644 --- a/ScanSupport.py +++ b/ScanSupport.py @@ -164,6 +164,8 @@ class ScanHandler(PathSupport.PathBuilder): def notlambda(sm): plog("DEBUG", "Job for setexit: "+exit_name) cond.acquire() + # Clear last successful exit, we're running a new test + self.last_exit = None sm.set_exit(exit_name) cond.notify() cond.release()

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 19 Oct '11

19 Oct '11

commit 05d030f94786388d53f9a92b5a7bed7eeea78bf6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 19 23:28:45 2011 +0000 Update translations for vidalia --- sr/vidalia_sr.po | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/sr/vidalia_sr.po b/sr/vidalia_sr.po index c90558f..51c5065 100644 --- a/sr/vidalia_sr.po +++ b/sr/vidalia_sr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-10-19 22:52+0000\n" +"PO-Revision-Date: 2011-10-19 23:09+0000\n" "Last-Translator: sdpuls <sdpuls(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1565,11 +1565,11 @@ msgstr "Лиценца" msgctxt "LicenseDialog" msgid "Credits" -msgstr "" +msgstr "Кредити" msgctxt "LogEvent" msgid "Debug" -msgstr "" +msgstr "Oтклањање грешке" msgctxt "LogEvent" msgid "Info" @@ -1577,7 +1577,7 @@ msgstr "Инфо" msgctxt "LogEvent" msgid "Notice" -msgstr "" +msgstr "Напомена" msgctxt "LogEvent" msgid "Warning" @@ -1625,15 +1625,15 @@ msgstr "Излаз" msgctxt "MainWindow" msgid "Bandwidth Graph" -msgstr "" +msgstr "Графикон протока" msgctxt "MainWindow" msgid "Message Log" -msgstr "" +msgstr "Дневник порука" msgctxt "MainWindow" msgid "Network Map" -msgstr "" +msgstr "Карта мреже" msgctxt "MainWindow" msgid "Control Panel" @@ -1645,7 +1645,7 @@ msgstr "Подешавања" msgctxt "MainWindow" msgid "About" -msgstr "" +msgstr "О нама" msgctxt "MainWindow" msgid "Help" @@ -1697,55 +1697,55 @@ msgstr "Видалиа Помоћ" msgctxt "MainWindow" msgid "Error starting web browser" -msgstr "" +msgstr "Грешка покретања веб претраживача" msgctxt "MainWindow" msgid "Vidalia was unable to start the configured web browser" -msgstr "" +msgstr "Видалиа није могао да почне конфигурисање веб претраживача" msgctxt "MainWindow" msgid "Error starting IM client" -msgstr "" +msgstr "Грешка покретање ИМ клијента" msgctxt "MainWindow" msgid "Vidalia was unable to start the configured IM client" -msgstr "" +msgstr "Видалиа није могао да почне конфигурисање клијента за ћаскање" msgctxt "MainWindow" msgid "Error starting proxy server" -msgstr "" +msgstr "Грешка покретање прокси сервера" msgctxt "MainWindow" msgid "Vidalia was unable to start the configured proxy server" -msgstr "" +msgstr "Видалиа није могао да почне конфигурисање прокси сервера" msgctxt "MainWindow" msgid "Connecting to a relay directory" -msgstr "" +msgstr "Повезивање са релеј директоријумом" msgctxt "MainWindow" msgid "Establishing an encrypted directory connection" -msgstr "" +msgstr "Успостављање шифроване везе директоријума" msgctxt "MainWindow" msgid "Retrieving network status" -msgstr "" +msgstr "Преузимање мрежног статуса" msgctxt "MainWindow" msgid "Loading network status" -msgstr "" +msgstr "Учитавање мрежног статуса" msgctxt "MainWindow" msgid "Loading authority certificates" -msgstr "" +msgstr "Преузимање сертификата ауторитета" msgctxt "MainWindow" msgid "Requesting relay information" -msgstr "" +msgstr "Захтев за пренос информације" msgctxt "MainWindow" msgid "Loading relay information" -msgstr "" +msgstr "Учитавање преноса информације" msgctxt "MainWindow" msgid "Connecting to the Tor network" @@ -1753,7 +1753,7 @@ msgstr "Повезивање на Тор мрежу" msgctxt "MainWindow" msgid "Establishing a Tor circuit" -msgstr "" +msgstr "Успостављање Тор круга" msgctxt "MainWindow" msgid "Connected to the Tor network!" @@ -1761,19 +1761,19 @@ msgstr "Повезан са Тор мрежом!" msgctxt "MainWindow" msgid "Unrecognized startup status" -msgstr "" +msgstr "Непризнат статус покретања" msgctxt "MainWindow" msgid "miscellaneous" -msgstr "" +msgstr "разно" msgctxt "MainWindow" msgid "identity mismatch" -msgstr "" +msgstr "идентитет неусклађен" msgctxt "MainWindow" msgid "done" -msgstr "" +msgstr "ради" msgctxt "MainWindow" msgid "connection refused"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 19 Oct '11

19 Oct '11

commit f9b90d63aef1bc8c12f6067d7125183aeb373c5c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 19 22:54:41 2011 +0000 Update translations for vidalia --- sr/vidalia_sr.po | 53 +++++++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/sr/vidalia_sr.po b/sr/vidalia_sr.po index 98cb628..c90558f 100644 --- a/sr/vidalia_sr.po +++ b/sr/vidalia_sr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-10-19 21:53+0000\n" +"PO-Revision-Date: 2011-10-19 22:52+0000\n" "Last-Translator: sdpuls <sdpuls(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1327,11 +1327,11 @@ msgstr "Изабери Извршни прокси" msgctxt "GeneralPage" msgid "You must specify the name of your Tor executable." -msgstr "" +msgstr "Морате навести име Тор извршне датотеке." msgctxt "GeneralPage" msgid "Start Vidalia when my system starts" -msgstr "" +msgstr "Почетак Видалиа када мој систем почне" msgctxt "GeneralPage" msgid "Browse" @@ -1355,39 +1355,39 @@ msgstr "Покрени прокси апликацију када се покр msgctxt "GeneralPage" msgid "Proxy Application Arguments:" -msgstr "" +msgstr "Аргументи прокси апликације:" msgctxt "GeneralPage" msgid "Software Updates" -msgstr "" +msgstr "Ажурирање софтвера" msgctxt "GeneralPage" msgid "Check for new software updates automatically" -msgstr "" +msgstr "Проверите да ли је нови софтвер доступан" msgctxt "GeneralPage" msgid "Check Now" -msgstr "" +msgstr "Провери одмах" msgctxt "GraphFrame" msgid "%1 KB/s" -msgstr "" +msgstr "%1 КБ/с" msgctxt "GraphFrame" msgid "%1 KB" -msgstr "" +msgstr "%1 КБ" msgctxt "GraphFrame" msgid "%1 MB" -msgstr "" +msgstr "%1 МБ" msgctxt "GraphFrame" msgid "%1 GB" -msgstr "" +msgstr "%1 ГБ" msgctxt "GraphFrame" msgid "Recv:" -msgstr "" +msgstr "Преузето:" msgctxt "GraphFrame" msgid "Sent:" @@ -1395,15 +1395,15 @@ msgstr "Послато:" msgctxt "HelpBrowser" msgid "Supplied XML file is not a valid Contents document." -msgstr "" +msgstr "Испоручен XML фајл није валидан садржај документа." msgctxt "HelpBrowser" msgid "Search reached end of document" -msgstr "" +msgstr "Тражилац достигао крај документа" msgctxt "HelpBrowser" msgid "Search reached start of document" -msgstr "" +msgstr "Тражилац достигао почетак документа" msgctxt "HelpBrowser" msgid "Text not found in document" @@ -1411,7 +1411,7 @@ msgstr "Текст није пронађен у документу" msgctxt "HelpBrowser" msgid "Found %1 results" -msgstr "" +msgstr "Пронађено %1 резултата" msgctxt "HelpBrowser" msgid "Vidalia Help" @@ -1431,7 +1431,7 @@ msgstr "Backspace " msgctxt "HelpBrowser" msgid "Forward" -msgstr "" +msgstr "Напред" msgctxt "HelpBrowser" msgid "Move to next page (Shift+Backspace)" @@ -1463,7 +1463,7 @@ msgstr "Тражи реч или фразу на тренутној страни msgctxt "HelpBrowser" msgid "Ctrl+F" -msgstr "" +msgstr "ЦТРЛ + Ф" msgctxt "HelpBrowser" msgid "Close" @@ -1491,7 +1491,7 @@ msgstr "Пронађи Следеће" msgctxt "HelpBrowser" msgid "Case sensitive" -msgstr "" +msgstr "Велика и мала слова" msgctxt "HelpBrowser" msgid "Whole words only" @@ -1499,7 +1499,7 @@ msgstr "Само целе речи" msgctxt "HelpBrowser" msgid "Help Topics" -msgstr "" +msgstr "Помоћ Теме" msgctxt "HelpBrowser" msgid "Contents" @@ -1519,11 +1519,11 @@ msgstr "Пронађени Документи" msgctxt "HelpBrowser" msgid "Error Loading Help Contents:" -msgstr "" +msgstr "Грешка при учитавању Помоћног Садржаја:" msgctxt "HelpTextBrowser" msgid "Opening External Link" -msgstr "" +msgstr "Отварање Спољног линка" msgctxt "HelpTextBrowser" msgid "" @@ -1531,10 +1531,13 @@ msgid "" "browser is not currently configured to use Tor then the request will not be " "anonymous." msgstr "" +"Видалиа неможе да отворим линк који сте одабрали у Вашем подразумеваном Веб " +"читачу. Уколико ваш прегледач тренутно није конфигурисан да користи Тор онда" +" захтев неће бити анонимна." msgctxt "HelpTextBrowser" msgid "Do you want Vidalia to open the link in your Web browser?" -msgstr "" +msgstr "Да ли желите да Видалиа отворили линк у вашем веб читачу?" msgctxt "HelpTextBrowser" msgid "Unable to Open Link" @@ -1545,10 +1548,12 @@ msgid "" "Vidalia was unable to open the selected link in your Web browser. You can " "still copy the URL and paste it into your browser." msgstr "" +"Видалиа није могао да отвори изабрану везу у Веб прегледачу. Још увек можете" +" да копирате УРЛ адресу и налепите га у свом прегледачу." msgctxt "HelpTextBrowser" msgid "Error opening help file:" -msgstr "" +msgstr "Грешка при отварању фајла за помоћ:" msgctxt "LicenseDialog" msgid "License Information"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 19 Oct '11

19 Oct '11

commit 916fe46645032ae68ec56fa990d8ce6f86fee99e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 19 22:25:27 2011 +0000 Update translations for vidalia --- sr/vidalia_sr.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sr/vidalia_sr.po b/sr/vidalia_sr.po index 7b1acf7..98cb628 100644 --- a/sr/vidalia_sr.po +++ b/sr/vidalia_sr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-10-19 21:48+0000\n" +"PO-Revision-Date: 2011-10-19 21:53+0000\n" "Last-Translator: sdpuls <sdpuls(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1315,15 +1315,15 @@ msgstr "" msgctxt "GeneralPage" msgid "Executables (*.exe)" -msgstr "" +msgstr "Извршне (*. exe)" msgctxt "GeneralPage" msgid "Select Path to Tor" -msgstr "" +msgstr "Одаберите Путању за Тор" msgctxt "GeneralPage" msgid "Select Proxy Executable" -msgstr "" +msgstr "Изабери Извршни прокси" msgctxt "GeneralPage" msgid "You must specify the name of your Tor executable."

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 19 Oct '11

19 Oct '11

commit 8ef27373c922c245e5fd07237ac652ced5c21171 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 19 21:54:24 2011 +0000 Update translations for vidalia --- sr/vidalia_sr.po | 50 +++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/sr/vidalia_sr.po b/sr/vidalia_sr.po index 379a413..7b1acf7 100644 --- a/sr/vidalia_sr.po +++ b/sr/vidalia_sr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-10-19 20:39+0000\n" +"PO-Revision-Date: 2011-10-19 21:48+0000\n" "Last-Translator: sdpuls <sdpuls(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -117,11 +117,11 @@ msgstr "Тор конфигурациона датотека" msgctxt "AdvancedPage" msgid "Start the Tor software with the specified configuration file (torrc)" -msgstr "Покрени Тор софтвер са наведеним конфигурационим фајлом" +msgstr "Покрени Тор са наведеним конфигурационим фајлом (torrc)" msgctxt "AdvancedPage" msgid "Select path to your configuration file" -msgstr "" +msgstr "Изабери путању конфигурационог фајла" msgctxt "AdvancedPage" msgid "Browse" @@ -137,7 +137,7 @@ msgstr "Ускладишти податке за Tor програм у след msgctxt "AdvancedPage" msgid "Select the directory used to store data for the Tor software" -msgstr "" +msgstr "Изаберите директоријум који се користи за складиштење података за Тор" msgctxt "AdvancedPage" msgid "Tor Control" @@ -222,7 +222,7 @@ msgstr "Стил" msgctxt "AppearancePage" msgid "Choose Vidalia's interface style" -msgstr "" +msgstr "Изабери Видалиа окружење интерфејса" msgctxt "AppearancePage" msgid "Vidalia was unable to load the selected language translation." @@ -242,7 +242,7 @@ msgstr "Прикажи Подешавања" msgctxt "BandwidthGraph" msgid "Tor Bandwidth Usage" -msgstr "" +msgstr "Тор пропусни опсег" msgctxt "BandwidthGraph" msgid "Reset" @@ -266,7 +266,7 @@ msgstr "Стил" msgctxt "BandwidthGraph" msgid "Changes the transparency of the Bandwidth Graph" -msgstr "" +msgstr "Промене транспарентност графике протока" msgctxt "BandwidthGraph" msgid "100" @@ -274,7 +274,7 @@ msgstr "100" msgctxt "BandwidthGraph" msgid "% Opaque" -msgstr "" +msgstr "% Непрозиран" msgctxt "BandwidthGraph" msgid "Save" @@ -306,11 +306,11 @@ msgstr "Преузимање Мостова" msgctxt "BridgeDownloaderProgressDialog" msgid "Unable to download bridges: %1" -msgstr "" +msgstr "Није могуће преузети мостове:%1" msgctxt "BridgeDownloaderProgressDialog" msgid "Retrying bridge request..." -msgstr "" +msgstr "Поновни покушај захтева за мост ..." msgctxt "BridgeUsageDialog" msgid "Country" @@ -322,15 +322,15 @@ msgstr "# Клијенти" msgctxt "BridgeUsageDialog" msgid "Clients from the following countries have used your relay since %1" -msgstr "" +msgstr "Клијенти из следећих земаља су користили релеј од%1" msgctxt "BridgeUsageDialog" msgid "Bridge Usage Summary" -msgstr "" +msgstr "Преглед употребе Моста" msgctxt "BridgeUsageDialog" msgid "Client Summary" -msgstr "" +msgstr "Преглед Клијената" msgctxt "Circuit" msgid "New" @@ -342,7 +342,7 @@ msgstr "Отворено" msgctxt "Circuit" msgid "Building" -msgstr "" +msgstr "Изгради" msgctxt "Circuit" msgid "Failed" @@ -370,11 +370,11 @@ msgstr "Статус" msgctxt "CircuitListWidget" msgid "Zoom to Circuit" -msgstr "" +msgstr "Зумирање у кругу" msgctxt "CircuitListWidget" msgid "Close Circuit (Del)" -msgstr "" +msgstr "Затвори круг (ДЕЛ)" msgctxt "CircuitListWidget" msgid "Close Stream (Del)" @@ -402,7 +402,7 @@ msgstr "Изглед" msgctxt "ConfigDialog" msgid "Advanced" -msgstr "" +msgstr "Напредан" msgctxt "ConfigDialog" msgid "Help" @@ -410,19 +410,19 @@ msgstr "Помоћ" msgctxt "ConfigDialog" msgid "Error Saving Settings" -msgstr "" +msgstr "Грешка чувања подешавања" msgctxt "ConfigDialog" msgid "Vidalia was unable to save your %1 settings." -msgstr "" +msgstr "Видалиа није био у могућности да сачува%1 поставке." msgctxt "ConfigDialog" msgid "Error Applying Settings" -msgstr "" +msgstr "Грешка Примене подешавања" msgctxt "ConfigDialog" msgid "Vidalia was unable to apply your %1 settings to Tor." -msgstr "" +msgstr "Видалиа није био у могућности да примени%1 подешавање на Тор." msgctxt "ConfigDialog" msgid "Settings" @@ -434,7 +434,7 @@ msgstr "Vidalia није могао да се повеже са Tor. (%1)" msgctxt "ControlConnection" msgid "Control socket is not connected." -msgstr "" +msgstr "Контролна утичница није повезана." msgctxt "ControlPasswordInputDialog" msgid "Password Required" @@ -454,7 +454,7 @@ msgstr "" msgctxt "ControlSocket" msgid "Control socket is not connected." -msgstr "" +msgstr "Контролна утичница није повезан." msgctxt "ControlSocket" msgid "Error sending control command. [%1]" @@ -462,11 +462,11 @@ msgstr "Грешка при слању контролне команде. [%1]" msgctxt "ControlSocket" msgid "Socket disconnected while attempting to read a line of data." -msgstr "" +msgstr "Утичница прекинута док је покушавала да прочита линију података." msgctxt "ControlSocket" msgid "Invalid control reply. [%1]" -msgstr "" +msgstr "Неважећи контролни одговор. [%1]" msgctxt "CountryInfo" msgid "Afghanistan"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 19 Oct '11

19 Oct '11

commit 38d8d4b91327930a7ed44a765601ebd30243e990 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 19 20:55:13 2011 +0000 Update translations for vidalia --- sr/vidalia_sr.po | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/sr/vidalia_sr.po b/sr/vidalia_sr.po index 4953707..379a413 100644 --- a/sr/vidalia_sr.po +++ b/sr/vidalia_sr.po @@ -1,14 +1,15 @@ # # Translators: # runasand <runa.sandvik(a)gmail.com>, 2011. +# <sdpuls(a)gmail.com>, 2011. # Vanja <medjutim(a)yahoo.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-09-08 00:47+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2011-10-19 20:39+0000\n" +"Last-Translator: sdpuls <sdpuls(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,11 +45,11 @@ msgstr "„%1“ није исправна IP адреса." msgctxt "AdvancedPage" msgid "" "You selected 'Password' authentication, but did not specify a password." -msgstr "" +msgstr "Изабрали сте проверу 'Лозинком', али нисте изабрали лозинку." msgctxt "AdvancedPage" msgid "Select Tor Configuration File" -msgstr "" +msgstr "Изаберите Тор Конфигурациону датотеку" msgctxt "AdvancedPage" msgid "File Not Found" @@ -56,7 +57,7 @@ msgstr "Датотека није пронађена" msgctxt "AdvancedPage" msgid "%1 does not exist. Would you like to create it?" -msgstr "" +msgstr "%1 не постоји. Да ли желите да креирате." msgctxt "AdvancedPage" msgid "Failed to Create File" @@ -64,15 +65,15 @@ msgstr "Није успео да креира датотеку" msgctxt "AdvancedPage" msgid "Unable to create %1 [%2]" -msgstr "" +msgstr "Није могуће креирати %1 [%2]" msgctxt "AdvancedPage" msgid "Select a Directory to Use for Tor Data" -msgstr "" +msgstr "Изабери директоријум који ћете користити за Тор податке" msgctxt "AdvancedPage" msgid "Unable to remove Tor Service" -msgstr "" +msgstr "Немогуће је уклонити Тор сервис" msgctxt "AdvancedPage" msgid "Unable to install Tor Service" @@ -112,11 +113,11 @@ msgstr ": " msgctxt "AdvancedPage" msgid "Tor Configuration File" -msgstr "" +msgstr "Тор конфигурациона датотека" msgctxt "AdvancedPage" msgid "Start the Tor software with the specified configuration file (torrc)" -msgstr "" +msgstr "Покрени Тор софтвер са наведеним конфигурационим фајлом" msgctxt "AdvancedPage" msgid "Select path to your configuration file"

1 0

[flashproxy/master] Omit "127.0.0.1" in connector usage example.
by dcf＠torproject.org 19 Oct '11

19 Oct '11

commit f05fe57942bcf183615e3bc3d4b5421ac4752ed9 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 19 10:58:17 2011 -0700 Omit "127.0.0.1" in connector usage example. That address is implied if you give only a port number. --- README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index 1b616e0..fc2c4df 100644 --- a/README +++ b/README @@ -67,7 +67,7 @@ ephemeral proxies. you have to use a different port (to get through a firewall, for example), give it on the command line like this (here using port 8888): - $ python connector.py -f tor-facilitator.bamsoftware.com 127.0.0.1:9001 :8888 + $ python connector.py -f tor-facilitator.bamsoftware.com :9001 :8888 2. Run Tor using the included torrc file. $ tor -f flashproxy/torrc

1 0

r25176: {website} Fix chmod call to put its option first (website/trunk)
by Sebastian Hahn 19 Oct '11

19 Oct '11

Author: sebastian Date: 2011-10-19 05:40:15 +0000 (Wed, 19 Oct 2011) New Revision: 25176 Modified: website/trunk/publish Log: Fix chmod call to put its option first Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2011-10-19 04:40:12 UTC (rev 25175) +++ website/trunk/publish 2011-10-19 05:40:15 UTC (rev 25176) @@ -8,7 +8,7 @@ make -j3 # abuse the cores # don't copy over stuff with permissions that make it useless -chmod a+r * -R +chmod -R a+r * rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi --exclude project -Prvz --delete . vescum.torproject.org:/srv/www-master.torproject.org/htdocs echo "Forcing mirror update"

1 0

r25175: {website} Update TBB design doc w/ an intro to the implementation sect (website/trunk/projects/torbrowser/design)
by Mike Perry 19 Oct '11

19 Oct '11

Author: mikeperry Date: 2011-10-19 04:40:12 +0000 (Wed, 19 Oct 2011) New Revision: 25175 Modified: website/trunk/projects/torbrowser/design/index.html.en Log: Update TBB design doc w/ an intro to the implementation section and some internal hyperlinks. Modified: website/trunk/projects/torbrowser/design/index.html.en =================================================================== --- website/trunk/projects/torbrowser/design/index.html.en 2011-10-18 13:35:40 UTC (rev 25174) +++ website/trunk/projects/torbrowser/design/index.html.en 2011-10-19 04:40:12 UTC (rev 25175) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>The Design and Implementation of the Tor Browser [DRAFT]</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2" /></head><body><div class="article" title="The Design and Implementation of the Tor Browser [DRAFT]"><div class="titlepage"><div><div><h2 class="title"><a id="design"></a>The Design and Implementation of the Tor Browser [DRAFT]</h2></div><div><div class="author"><h3 class="author"><span class="firstname">Mike</span> <span class="surname">Perry</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:mikeperry#torproject org">mikeperry#torproject org</a>></code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Erinn</span> <span class="surname">Clark</span></h3><div class="affiliation"><div class="address"><p><code class= "email"><<a class="email" href="mailto:erinn#torproject org">erinn#torproject org</a>></code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Steven</span> <span class="surname">Murdoch</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:sjmurdoch#torproject org">sjmurdoch#torproject org</a>></code></p></div></div></div></div><div><p class="pubdate">Oct 11 2011</p></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id2869610">1. Introduction</a></span></dt><dd><dl><dt><span class="sect2"><a href="#adversary">1.1. Adversary Model</a></span></dt></dl></dd><dt><span class="sect1"><a href="#DesignRequirements">2. Design Requirements and Philosophy</a></span></dt><dd><dl><dt><span class="sect2"><a href="#security">2.1. Security Requirements</a></span></dt><dt><span class="sect2"><a href="#privacy">2.2. Pr ivacy Requirements</a></span></dt><dt><span class="sect2"><a href="#philosophy">2.3. Philosophy</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Implementation">3. Implementation</a></span></dt><dd><dl><dt><span class="sect2"><a href="#proxy-obedience">3.1. Proxy Obedience</a></span></dt><dt><span class="sect2"><a href="#state-separation">3.2. State Separation</a></span></dt><dt><span class="sect2"><a href="#disk-avoidance">3.3. Disk Avoidance</a></span></dt><dt><span class="sect2"><a href="#app-data-isolation">3.4. Application Data Isolation</a></span></dt><dt><span class="sect2"><a href="#identifier-linkability">3.5. Cross-Origin Identifier Unlinkability</a></span></dt><dt><span class="sect2"><a href="#fingerprinting-linkability">3.6. Cross-Origin Fingerprinting Unlinkability</a></span></dt><dt><span class="sect2"><a href="#new-identity">3.7. Long-Term Unlinkability via "New Identity" button</a></span></dt><dt><span class="sect2"><a href="#click-to-play">3.8. Cli ck-to-play for plugins and invasive content</a></span></dt><dt><span class="sect2"><a href="#firefox-patches">3.9. Description of Firefox Patches</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Packaging">4. Packaging</a></span></dt><dd><dl><dt><span class="sect2"><a href="#build-security">4.1. Build Process Security</a></span></dt><dt><span class="sect2"><a href="#addons">4.2. External Addons</a></span></dt><dt><span class="sect2"><a href="#prefs">4.3. Pref Changes</a></span></dt><dt><span class="sect2"><a href="#update-mechanism">4.4. Update Security</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Testing">5. Testing</a></span></dt><dd><dl><dt><span class="sect2"><a href="#SingleStateTesting">5.1. Single state testing</a></span></dt></dl></dd></dl></div><div class="sect1" title="1. Introduction"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2869610"></a>1. Introduction</h2></div></div></div><p> +<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>The Design and Implementation of the Tor Browser [DRAFT]</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2" /></head><body><div class="article" title="The Design and Implementation of the Tor Browser [DRAFT]"><div class="titlepage"><div><div><h2 class="title"><a id="design"></a>The Design and Implementation of the Tor Browser [DRAFT]</h2></div><div><div class="author"><h3 class="author"><span class="firstname">Mike</span> <span class="surname">Perry</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:mikeperry#torproject org">mikeperry#torproject org</a>></code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Erinn</span> <span class="surname">Clark</span></h3><div class="affiliation"><div class="address"><p><code class= "email"><<a class="email" href="mailto:erinn#torproject org">erinn#torproject org</a>></code></p></div></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Steven</span> <span class="surname">Murdoch</span></h3><div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:sjmurdoch#torproject org">sjmurdoch#torproject org</a>></code></p></div></div></div></div><div><p class="pubdate">Oct 19 2011</p></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#id3042393">1. Introduction</a></span></dt><dd><dl><dt><span class="sect2"><a href="#adversary">1.1. Adversary Model</a></span></dt></dl></dd><dt><span class="sect1"><a href="#DesignRequirements">2. Design Requirements and Philosophy</a></span></dt><dd><dl><dt><span class="sect2"><a href="#security">2.1. Security Requirements</a></span></dt><dt><span class="sect2"><a href="#privacy">2.2. Pr ivacy Requirements</a></span></dt><dt><span class="sect2"><a href="#philosophy">2.3. Philosophy</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Implementation">3. Implementation</a></span></dt><dd><dl><dt><span class="sect2"><a href="#proxy-obedience">3.1. Proxy Obedience</a></span></dt><dt><span class="sect2"><a href="#state-separation">3.2. State Separation</a></span></dt><dt><span class="sect2"><a href="#disk-avoidance">3.3. Disk Avoidance</a></span></dt><dt><span class="sect2"><a href="#app-data-isolation">3.4. Application Data Isolation</a></span></dt><dt><span class="sect2"><a href="#identifier-linkability">3.5. Cross-Origin Identifier Unlinkability</a></span></dt><dt><span class="sect2"><a href="#fingerprinting-linkability">3.6. Cross-Origin Fingerprinting Unlinkability</a></span></dt><dt><span class="sect2"><a href="#new-identity">3.7. Long-Term Unlinkability via "New Identity" button</a></span></dt><dt><span class="sect2"><a href="#click-to-play">3.8. Cli ck-to-play for plugins and invasive content</a></span></dt><dt><span class="sect2"><a href="#firefox-patches">3.9. Description of Firefox Patches</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Packaging">4. Packaging</a></span></dt><dd><dl><dt><span class="sect2"><a href="#build-security">4.1. Build Process Security</a></span></dt><dt><span class="sect2"><a href="#addons">4.2. External Addons</a></span></dt><dt><span class="sect2"><a href="#prefs">4.3. Pref Changes</a></span></dt><dt><span class="sect2"><a href="#update-mechanism">4.4. Update Security</a></span></dt></dl></dd><dt><span class="sect1"><a href="#Testing">5. Testing</a></span></dt><dd><dl><dt><span class="sect2"><a href="#SingleStateTesting">5.1. Single state testing</a></span></dt></dl></dd></dl></div><div class="sect1" title="1. Introduction"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id3042393"></a>1. Introduction</h2></div></div></div><p> This document describes the <a class="link" href="#adversary" title="1.1. Adversary Model">adversary model</a>, <a class="link" href="#DesignRequirements" title="2. Design Requirements and Philosophy">design requirements</a>, @@ -224,18 +224,22 @@ respect to platform support, security requirements are the minimum properties in order for Tor to support the use of a web client platform. - </p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><span class="command"><strong>Proxy Obedience</strong></span><p>The browser -MUST NOT bypass Tor proxy settings for any content.</p></li><li class="listitem"><span class="command"><strong>State Separation</strong></span><p>The browser MUST NOT provide any stored state to the content window + </p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><a class="link" href="#proxy-obedience" title="3.1. Proxy Obedience"><span class="command"><strong>Proxy +Obedience</strong></span></a><p>The browser +MUST NOT bypass Tor proxy settings for any content.</p></li><li class="listitem"><a class="link" href="#state-separation" title="3.2. State Separation"><span class="command"><strong>State +Separation</strong></span></a><p>The browser MUST NOT provide any stored state to the content window from other browsers or other browsing modes, including shared state from plugins, machine identifiers, and TLS session state. -</p></li><li class="listitem"><span class="command"><strong>Disk Avoidance</strong></span><p> +</p></li><li class="listitem"><a class="link" href="#disk-avoidance" title="3.3. Disk Avoidance"><span class="command"><strong>Disk +Avoidance</strong></span></a><p> The browser MUST NOT write any information that is derived from or that reveals browsing activity to the disk, or store it in memory beyond the duration of one browsing session, unless the user has explicitly opted to store their browsing history information to disk. -</p></li><li class="listitem"><span class="command"><strong>Application Data Isolation</strong></span><p> +</p></li><li class="listitem"><a class="link" href="#app-data-isolation" title="3.4. Application Data Isolation"><span class="command"><strong>Application Data +Isolation</strong></span></a><p> The components involved in providing private browsing MUST be self-contained, or MUST provide a mechanism for rapid, complete removal of all evidence of the @@ -248,7 +252,7 @@ to permissions issues with access to swap, implementations MAY choose to leave it out of scope, and/or leave it to the user to implement encrypted swap. -</p></li><li class="listitem"><span class="command"><strong>Update Safety</strong></span><p>The browser SHOULD NOT perform unsafe updates or upgrades.</p></li></ol></div></div><div class="sect2" title="2.2. Privacy Requirements"><div class="titlepage"><div><div><h3 class="title"><a id="privacy"></a>2.2. Privacy Requirements</h3></div></div></div><p> +</p></li></ol></div></div><div class="sect2" title="2.2. Privacy Requirements"><div class="titlepage"><div><div><h3 class="title"><a id="privacy"></a>2.2. Privacy Requirements</h3></div></div></div><p> The privacy requirements are primarily concerned with reducing linkability: the ability for a user's activity on one site to be linked with their activity @@ -265,7 +269,8 @@ google.com. Implementations MAY, at their option, restrict the url bar origin to be the entire fully qualified domain name. - </p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><span class="command"><strong>Cross-Origin Identifier Unlinkability</strong></span><p> + </p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><a class="link" href="#identifier-linkability" title="3.5. Cross-Origin Identifier Unlinkability"><span class="command"><strong>Cross-Origin +Identifier Unlinkability</strong></span></a><p> User activity on one url bar origin MUST NOT be linkable to their activity in any other url bar origin by any third party automatically or without user @@ -275,13 +280,15 @@ to sites, or due information submitted during manual link traversal. This functionality SHOULD NOT interfere with federated login in a substantial way. - </p></li><li class="listitem"><span class="command"><strong>Cross-Origin Fingerprinting Unlinkability</strong></span><p> + </p></li><li class="listitem"><a class="link" href="#fingerprinting-linkability" title="3.6. Cross-Origin Fingerprinting Unlinkability"><span class="command"><strong>Cross-Origin +Fingerprinting Unlinkability</strong></span></a><p> User activity on one url bar origin MUST NOT be linkable to their activity in any other url bar origin by any third party. This property specifically applies to linkability from fingerprinting browser behavior. - </p></li><li class="listitem"><span class="command"><strong>Long-Term Unlinkability</strong></span><p> + </p></li><li class="listitem"><a class="link" href="#new-identity" title="3.7. Long-Term Unlinkability via "New Identity" button"><span class="command"><strong>Long-Term +Unlinkability</strong></span></a><p> The browser SHOULD provide an obvious, easy way to remove all of its authentication tokens and browser state and obtain a fresh identity. @@ -385,6 +392,21 @@ their proper deployment or privacy realization. However, we will likely disable certain new features (where possible) pending analysis and audit. </p></li></ol></div></div></div><div class="sect1" title="3. Implementation"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Implementation"></a>3. Implementation</h2></div></div></div><p> + +The Implementation section is divided into subsections, each of which +corresponds to a <a class="link" href="#DesignRequirements" title="2. Design Requirements and Philosophy">Design Requirement</a>. +Each subsection is divided into specific web technologies or properties. The +implementation is then described for that property. + + </p><p> + +In some cases, the implementation meets the design requirements in a non-ideal +way (for example, by disabling features). In rare cases, there may be no +implementation at all. Both of these cases are denoted by differentiating +between the <span class="command"><strong>Design Goal</strong></span> and the <span class="command"><strong>Implementation +Status</strong></span> for each property. Corresponding bugs in the <a class="ulink" href="https://trac.torproject.org/projects/tor/report" target="_top">Tor bug tracker</a> +are typically linked for these cases. + </p><div class="sect2" title="3.1. Proxy Obedience"><div class="titlepage"><div><div><h3 class="title"><a id="proxy-obedience"></a>3.1. Proxy Obedience</h3></div></div></div><p> Proxy obedience is assured through the following: @@ -444,13 +466,13 @@ Tor Browser State is separated from existing browser state through use of a custom Firefox profile. Furthermore, plugins are disabled, which prevents Flash cookies from leaking from a pre-existing Flash directory. - </p></div><div class="sect2" title="3.3. Disk Avoidance"><div class="titlepage"><div><div><h3 class="title"><a id="disk-avoidance"></a>3.3. Disk Avoidance</h3></div></div></div><div class="sect3" title="Design Goal:"><div class="titlepage"><div><div><h4 class="title"><a id="id2901874"></a>Design Goal:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> + </p></div><div class="sect2" title="3.3. Disk Avoidance"><div class="titlepage"><div><div><h3 class="title"><a id="disk-avoidance"></a>3.3. Disk Avoidance</h3></div></div></div><div class="sect3" title="Design Goal:"><div class="titlepage"><div><div><h4 class="title"><a id="id3048300"></a>Design Goal:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> Tor Browser MUST (at user option) prevent all disk records of browser activity. The user should be able to optionally enable URL history and other history features if they so desire. Once we <a class="ulink" href="https://trac.torproject.org/projects/tor/ticket/3100" target="_top">simplify the preferences interface</a>, we will likely just enable Private Browsing mode by default to handle this goal. - </blockquote></div></div><div class="sect3" title="Implementation Status:"><div class="titlepage"><div><div><h4 class="title"><a id="id2878481"></a>Implementation Status:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> + </blockquote></div></div><div class="sect3" title="Implementation Status:"><div class="titlepage"><div><div><h4 class="title"><a id="id3052558"></a>Implementation Status:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> For now, Tor Browser blocks write access to the disk through Torbutton using several Firefox preferences. @@ -515,7 +537,7 @@ context-menu option to drill down into specific types of state or permissions. An example of this simplification can be seen in Figure 1. - </p><div class="figure"><a id="id2898980"></a><p class="title"><b>Figure 1. Improving the Privacy UI</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="CookieManagers.png" align="middle" alt="Improving the Privacy UI" /></div><div class="caption"><p></p> + </p><div class="figure"><a id="id3051496"></a><p class="title"><b>Figure 1. Improving the Privacy UI</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="CookieManagers.png" align="middle" alt="Improving the Privacy UI" /></div><div class="caption"><p></p> On the left is the standard Firefox cookie manager. On the right is a mock-up of how isolating identifiers to the URL bar origin might simplify the privacy @@ -939,11 +961,11 @@ </p></li></ol></div></div><div class="sect2" title="3.7. Long-Term Unlinkability via "New Identity" button"><div class="titlepage"><div><div><h3 class="title"><a id="new-identity"></a>3.7. Long-Term Unlinkability via "New Identity" button</h3></div></div></div><p> In order to avoid long-term linkability, we provide a "New Identity" context menu option in Torbutton. - </p><div class="sect3" title="Design Goal:"><div class="titlepage"><div><div><h4 class="title"><a id="id2857700"></a>Design Goal:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> + </p><div class="sect3" title="Design Goal:"><div class="titlepage"><div><div><h4 class="title"><a id="id3068567"></a>Design Goal:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> All linkable identifiers and browser state MUST be cleared by this feature. - </blockquote></div></div><div class="sect3" title="Implementation Status:"><div class="titlepage"><div><div><h4 class="title"><a id="id2877575"></a>Implementation Status:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> + </blockquote></div></div><div class="sect3" title="Implementation Status:"><div class="titlepage"><div><div><h4 class="title"><a id="id3057460"></a>Implementation Status:</h4></div></div></div><div class="blockquote"><blockquote class="blockquote"> First, Torbutton disables all open tabs and windows via nsIContentPolicy blocking, and then closes each tab and window. The extra step for blocking @@ -1042,7 +1064,7 @@ This patch prevents random URLs from being inserted into content-prefs.sqllite in the profile directory as content prefs change (includes site-zoom and perhaps other site prefs?). - </p></li></ol></div></div></div><div class="sect1" title="4. Packaging"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Packaging"></a>4. Packaging</h2></div></div></div><p> </p><div class="sect2" title="4.1. Build Process Security"><div class="titlepage"><div><div><h3 class="title"><a id="build-security"></a>4.1. Build Process Security</h3></div></div></div><p> </p></div><div class="sect2" title="4.2. External Addons"><div class="titlepage"><div><div><h3 class="title"><a id="addons"></a>4.2. External Addons</h3></div></div></div><p> </p><div class="sect3" title="Included Addons"><div class="titlepage"><div><div><h4 class="title"><a id="id2889516"></a>Included Addons</h4></div></div></div></div><div class="sect3" title="Excluded Addons"><div class="titlepage"><div><div><h4 class="title"><a id="id2875722"></a>Excluded Addons</h4></div></div></div></div><div class="sect3" title="Dangerous Addons"><div class="titlepage"><div><div><h4 cla ss="title"><a id="id2861148"></a>Dangerous Addons</h4></div></div></div></div></div><div class="sect2" title="4.3. Pref Changes"><div class="titlepage"><div><div><h3 class="title"><a id="prefs"></a>4.3. Pref Changes</h3></div></div></div><p> </p></div><div class="sect2" title="4.4. Update Security"><div class="titlepage"><div><div><h3 class="title"><a id="update-mechanism"></a>4.4. Update Security</h3></div></div></div><p> </p></div></div><div class="sect1" title="5. Testing"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Testing"></a>5. Testing</h2></div></div></div><p> + </p></li></ol></div></div></div><div class="sect1" title="4. Packaging"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Packaging"></a>4. Packaging</h2></div></div></div><p> </p><div class="sect2" title="4.1. Build Process Security"><div class="titlepage"><div><div><h3 class="title"><a id="build-security"></a>4.1. Build Process Security</h3></div></div></div><p> </p></div><div class="sect2" title="4.2. External Addons"><div class="titlepage"><div><div><h3 class="title"><a id="addons"></a>4.2. External Addons</h3></div></div></div><p> </p><div class="sect3" title="Included Addons"><div class="titlepage"><div><div><h4 class="title"><a id="id3033960"></a>Included Addons</h4></div></div></div></div><div class="sect3" title="Excluded Addons"><div class="titlepage"><div><div><h4 class="title"><a id="id3033967"></a>Excluded Addons</h4></div></div></div></div><div class="sect3" title="Dangerous Addons"><div class="titlepage"><div><div><h4 cla ss="title"><a id="id3033984"></a>Dangerous Addons</h4></div></div></div></div></div><div class="sect2" title="4.3. Pref Changes"><div class="titlepage"><div><div><h3 class="title"><a id="prefs"></a>4.3. Pref Changes</h3></div></div></div><p> </p></div><div class="sect2" title="4.4. Update Security"><div class="titlepage"><div><div><h3 class="title"><a id="update-mechanism"></a>4.4. Update Security</h3></div></div></div><p> </p></div></div><div class="sect1" title="5. Testing"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Testing"></a>5. Testing</h2></div></div></div><p> The purpose of this section is to cover all the known ways that Tor browser security can be subverted from a penetration testing perspective. The hope

1 0

r25174: {website} fix two of the faq answers. (website/trunk/docs/en)
by Andrew Lewman 18 Oct '11

18 Oct '11

Author: phobos Date: 2011-10-18 13:35:40 +0000 (Tue, 18 Oct 2011) New Revision: 25174 Modified: website/trunk/docs/en/faq.wml Log: fix two of the faq answers. Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2011-10-18 09:07:12 UTC (rev 25173) +++ website/trunk/docs/en/faq.wml 2011-10-18 13:35:40 UTC (rev 25174) @@ -24,8 +24,7 @@ <li><a href="#Backdoor">Is there a backdoor in Tor?</a></li> <li><a href="#DistributingTor">Can I distribute Tor on my magazine's CD?</a></li> - <li><a href="#SupportMail">How can I get an answer to my - Tor support mail?</a></li> + <li><a href="#SupportMail">How can I get support?</a></li> <li><a href="#WhySlow">Why is Tor so slow?</a></li> <li><a href="#Funding">What would The Tor Project do with more funding?</a></li> @@ -372,7 +371,7 @@ <hr> <a id="SupportMail"></a> - <h3><a class="anchor" href="#SupportMail">How can I get an answer to my Tor support mail?</a></h3> + <h3><a class="anchor" href="#SupportMail">How can I get support?</a></h3> <p>There is no official support for Tor. Your best bet is to try the following:</p> <ol> @@ -380,13 +379,13 @@ <li>Read through the <a href="<page docs/documentation>">documentation</a>.</li> <li>Read through the <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk">tor-talk - archives</a> and - see if your question is already answered.</li> + archives</a> and see if your question is already answered.</li> <li>Join our <a href="irc://irc.oftc.net#tor">irc channel</a> and state the issue and wait for help.</li> - <li>Send an email to tor-assistants at torproject.org. These are - volunteers who may be able to help you but you may not get a response - for days.</li> + <li>Send an email to <a + href="mailto:community-support@lists.torproject.org">community-support</a>. + These are volunteers who may be able to help you but you may not + get a response for days.</li> </ol> <p>If you find your answer, please stick around on the IRC channel or the @@ -911,13 +910,14 @@ <p> Torbutton 1.2.5 (released in mid 2010) detects Google captchas and can automatically redirect you to a more Tor-friendly search engine such as -Ixquick or Bing. +DuckDuckGo, ixquick, or Bing. </p> <hr /> <a id="GmailWarning"></a> -<h3><a class="anchor" href="#GmailWarning">Gmail warns me that my account may have been compromised.</a></h3> +<h3><a class="anchor" href="#GmailWarning">Gmail warns me that my account +may have been compromised.</a></h3> <p> Sometimes, after you've used Gmail over Tor, Google presents a

1 0