- tor-commits - lists.torproject.org

[torbrowser/master] update vidalia config for the 0.2.x series instead
by erinn＠torproject.org 13 Jul '12

13 Jul '12

commit c29fe3f466bf2075087f60b645d63476cf42ace0 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Jul 13 13:48:44 2012 +0200 update vidalia config for the 0.2.x series instead --- build-scripts/config/alpha/vidalia.conf.ff | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build-scripts/config/alpha/vidalia.conf.ff b/build-scripts/config/alpha/vidalia.conf.ff index 58036b5..1d9d2fa 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff +++ b/build-scripts/config/alpha/vidalia.conf.ff @@ -1,13 +1,14 @@ [General] -PluginPath=.\\Data\\Vidalia\\plugins +BrowserDirectory=..\\FirefoxPortable\\App\\Firefox +BrowserExecutable=tbb-firefox.exe LanguageCode=en +ProfileDirectory=..\\..\\Data\\profile +DefaultProfileDirectory=..\\DefaultData\\profile +PluginsDirectory=..\\..\\Data\\plugins +DefaultPluginsDirectory=..\\DefaultData\\plugins [Tor] ControlPort=9051 -TorExecutable=.\\App\\tor.exe -Torrc=.\\Data\\Tor\\torrc -DataDirectory=.\\Data\\Tor - -[TBB] -BrowserDirectory=FirefoxPortable -BrowserExecutable=tbb-firefox.exe +TorExecutable=.\\tor.exe +Torrc=..\\Data\\Tor\\torrc +DataDirectory=..\\Data\\Tor

1 0

[torbrowser/maint-2.3] add obfsproxy configs for windows
by erinn＠torproject.org 13 Jul '12

13 Jul '12

commit 177605a2ff602c4ab18b4e5fb1eab341466fe484 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Jul 13 13:55:02 2012 +0200 add obfsproxy configs for windows --- build-scripts/config/alpha/torrc-obfsproxy | 30 +++++++++++++++++ .../config/alpha/vidalia.conf.ff-obfsproxy | 34 ++++++++++++++++++++ 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/alpha/torrc-obfsproxy b/build-scripts/config/alpha/torrc-obfsproxy new file mode 100644 index 0000000..5df778a --- /dev/null +++ b/build-scripts/config/alpha/torrc-obfsproxy @@ -0,0 +1,30 @@ +# If non-zero, try to write to disk less frequently than we would otherwise. +AvoidDiskWrites 1 +# Store working data, state, keys, and caches here. +DataDirectory .\Data\Tor +GeoIPFile .\Data\Tor\geoip +# Where to send logging messages. Format is minSeverity[-maxSeverity] +# (stderr|stdout|syslog|file FILENAME). +Log notice stdout +# Bind to this address to listen to connections from SOCKS-speaking +# applications. +SocksListenAddress 127.0.0.1 + +UseBridges 1 + +bridge obfs2 38.229.33.18:42401 +bridge obfs2 85.17.20.242:61264 +bridge obfs2 85.214.131.213:1051 +bridge obfs2 86.59.30.35:45605 +bridge obfs2 91.208.34.7:5353 +bridge obfs2 109.105.109.163:53999 +bridge obfs2 109.163.233.195:1051 +bridge obfs2 128.31.0.34:1051 +bridge obfs2 131.215.158.1:29936 +bridge obfs2 173.254.192.38:1051 +bridge obfs2 188.40.20.215:32982 +bridge obfs2 212.112.242.160:49259 +bridge obfs2 213.108.105.129:36609 + +ClientTransportPlugin obfs2 exec obfsproxy --managed + diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy new file mode 100644 index 0000000..6d6fa7d --- /dev/null +++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy @@ -0,0 +1,34 @@ +[General] +BrowserDirectory=..\\FirefoxPortable\\App\\Firefox +BrowserExecutable=tbb-firefox.exe +LanguageCode=en +ProfileDirectory=..\\..\\Data\\profile +DefaultProfileDirectory=..\\DefaultData\\profile +PluginsDirectory=..\\..\\Data\\plugins +DefaultPluginsDirectory=..\\DefaultData\\plugins + +[Tor] +ControlPort=9051 +TorExecutable=.\\tor.exe +Torrc=..\\Data\\Tor\\torrc +DataDirectory=..\\Data\\Tor + +[Network] +ProxyType=none +UseBridges=true +Bridge=obfs2 38.229.33.18:42401, obfs2 85.17.20.242:61264, obfs2 85.214.131.213:1051, obfs2 86.59.30.35:45605, obfs2 91.208.34.7:5353, obfs2 109.105.109.163:53999, obfs2 109.163.233.195:1051, obfs2 128.31.0.34:1051, obfs2 131.215.158.1:29936, obfs2 173.254.192.38:1051, obfs2 188.40.20.215:32982, obfs2 212.112.242.160:49259, obfs2 213.108.105.129:36609 + +[MessageLog] +Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x2\xc9\0\0\x2\x96\0\0\0\b\0\0\0\x1e\0\0\x2\xc1\0\0\x2\x8e\0\0\0\0\0\0) + +[BandwidthGraph] +Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x2(\0\0\x1X\0\0\0\0\0\0\0\0\0\0\x2(\0\0\x1X\0\0\0\0\0\0) + +[NetViewer] +Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x3K\0\0\x2S\0\0\0\0\0\0\0\0\0\0\x3K\0\0\x2S\0\0\0\0\0\0) + +[ConfigDialog] +Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x2W\0\0\x1\x8f\0\0\0\0\0\0\0\0\0\0\x2W\0\0\x1\x8f\0\0\0\0\0\0) + +[MainWindow] +Geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\x1J\0\0\0\xaf\0\0\x2\xb5\0\0\x2R\0\0\x1R\0\0\0\xcd\0\0\x2\xad\0\0\x2J\0\0\0\0\0\0)

1 0

[torbrowser/maint-2.3] update vidalia config for the 0.2.x series instead
by erinn＠torproject.org 13 Jul '12

13 Jul '12

commit c29fe3f466bf2075087f60b645d63476cf42ace0 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Jul 13 13:48:44 2012 +0200 update vidalia config for the 0.2.x series instead --- build-scripts/config/alpha/vidalia.conf.ff | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build-scripts/config/alpha/vidalia.conf.ff b/build-scripts/config/alpha/vidalia.conf.ff index 58036b5..1d9d2fa 100644 --- a/build-scripts/config/alpha/vidalia.conf.ff +++ b/build-scripts/config/alpha/vidalia.conf.ff @@ -1,13 +1,14 @@ [General] -PluginPath=.\\Data\\Vidalia\\plugins +BrowserDirectory=..\\FirefoxPortable\\App\\Firefox +BrowserExecutable=tbb-firefox.exe LanguageCode=en +ProfileDirectory=..\\..\\Data\\profile +DefaultProfileDirectory=..\\DefaultData\\profile +PluginsDirectory=..\\..\\Data\\plugins +DefaultPluginsDirectory=..\\DefaultData\\plugins [Tor] ControlPort=9051 -TorExecutable=.\\App\\tor.exe -Torrc=.\\Data\\Tor\\torrc -DataDirectory=.\\Data\\Tor - -[TBB] -BrowserDirectory=FirefoxPortable -BrowserExecutable=tbb-firefox.exe +TorExecutable=.\\tor.exe +Torrc=..\\Data\\Tor\\torrc +DataDirectory=..\\Data\\Tor

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 13 Jul '12

13 Jul '12

commit 2e888bbf07d1bdd62c37198ad6f319a8085885f9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 13 09:45:35 2012 +0000 Update translations for https_everywhere_completed --- ko/ssl-observatory.dtd | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 87 insertions(+), 0 deletions(-) diff --git a/ko/ssl-observatory.dtd b/ko/ssl-observatory.dtd new file mode 100644 index 0000000..e6821f5 --- /dev/null +++ b/ko/ssl-observatory.dtd @@ -0,0 +1,87 @@ + +<!ENTITY ssl-observatory.popup.details "세부 사항과 사생활 정보"> +<!ENTITY ssl-observatory.popup.later "나중에 알림"> +<!ENTITY ssl-observatory.popup.no "아니도"> + +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere"> + + + +<!ENTITY ssl-observatory.popup.title +"HTTPS Everywhere이 SSL 관측소를 사용해야 합니까?"> + +<!ENTITY ssl-observatory.popup.yes "예"> + + + +<!ENTITY ssl-observatory.prefs.adv_priv_opts1 +"매우 방해하는 기업 네트워크를 사용중이지 않으면, 이것을 사용하는 것이 안전압니다."> + +<!ENTITY ssl-observatory.prefs.adv_priv_opts2 +"다음 비밀 서버 이름과 기업 네트워크를 사용하지 않는다면, 안전합니다."> + +<!ENTITY ssl-observatory.prefs.alt_roots +"비표준 루트 CA로부터 서명되지 않은 인증서를 확인하고 제보함."> + +<!ENTITY ssl-observatory.prefs.alt_roots_tooltip +"개인 루트 인증서 권한과 부라우징을 모니터하는 방해하는 기업 네트워크나 TLS 프록시와 카스퍼스키 안티바이러스를 사용하지 않는다면, 이 옵션을 활성화하는 것은 안전합니다(그리고 좋은 생각입니다). 그 네트워크에서 활성화된다면, 이 옵션은 제공되어져야하는 드문 인증서 때문에 https:// 도메인을 그 프록시를 통해 방문한 증거를 알릴 것입니다. 그래서 우리는 기본값으로 두는 것을 추천합니다."> + +<!ENTITY ssl-observatory.prefs.anonymous "익명을 위해 Tor를 사용하는 동안 인증서 확인"> +<!ENTITY ssl-observatory.prefs.anonymous_unavailable +"익명을 위해 Tor를 사용하는 동안 인증서 확인 (Torcheck 권장)"> +<!ENTITY ssl-observatory.prefs.anonymous_tooltip +"이 옵션은 Tor와 Torbutton이 설치된 경우 권장됩니다."> + +<!ENTITY ssl-observatory.prefs.asn +"새로운 인증서를 볼 때, 어떤 ISP에 연결되어 있는지 관측소에 말하십시오."> + +<!ENTITY ssl-observatory.prefs.asn_tooltip +"이것은 귀하의 네트워크의 "자율 시스템 번호"를 수집하고 전송할 것입니다. 이것은 우리가 HTTPS에 대항하는 공격을 찾는 것에 대해 도움을 줄 것입니다. 그리고 우리는 공격이 비교적 일반적인 이란과 시리아와 같은 장소에서 네트워크에서 관측소를 가지고 있는지에 대한 여부를 확인하는 데 도움이 될 것입니다."> + +<!ENTITY ssl-observatory.prefs.done "완료"> + +<!ENTITY ssl-observatory.prefs.explanation +"HTTPS Everywhere은 EFF의 SSL 관측소를 사용할 수 있습니다. 이것은 두 가지 일을 합니다: (1) +중간자 공격을 감지하고 웹의 보안을 향상시키는 것을 돕기 위해, HTTPS 인증서의 복사본을 SSL 관측소로 보냅니다. 그리고 (2) 우리가 귀하에게 보안적이지 않는 연결이나 브라우저에 대한 공격에 대해 경고하도록 합니다."> + + + +<!ENTITY ssl-observatory.prefs.explanation2 + +"예를 들어, https://www.something.com을 방문할 때, 관측소에서 받은 인증서는 누가 사이트를 방문했는지가 아닌, 누가 www.something.com을 방문했거나, 그들이 본 특정한 페이지 키를 표시할 것입니다. 더 많은 세부사항을 위해 옵션을 선택하십시오."> + +<!ENTITY ssl-observatory.prefs.hide "고급 설정 숨기기"> + +<!ENTITY ssl-observatory.prefs.nonanon +"Tor가 가능하지 않더라도 인증서 확인"> + +<!ENTITY ssl-observatory.prefs.nonanon_tooltip +"우리는 계속 데이터를 익명으로 보내겠지만, 이 선택은 덜 보안적입니다."> + +<!ENTITY ssl-observatory.prefs.priv_dns +"non-public DNS 이름을 위한 인증서 확인과 제출"> + +<!ENTITY ssl-observatory.prefs.priv_dns_tooltip +"이 옵션이 선택되지 않는다면, 관측소는 DNS 시스템을 통해 분석될 수 없는 인증서를 기록하지 않을 것입니다."> + +<!ENTITY ssl-observatory.prefs.show "고급 설정 보이기"> + +<!ENTITY ssl-observatory.prefs.title "SSL 관측소 설정"> + +<!ENTITY ssl-observatory.prefs.use "관측소 사용?"> +<!ENTITY ssl-observatory.warning.title "EFF의 SSL 관측소로부터의 경고"> +<!ENTITY ssl-observatory.warning.showcert "인증서 체인 보이기"> +<!ENTITY ssl-observatory.warning.okay "이해했습니다."> +<!ENTITY ssl-observatory.warning.text "EFF의 SSL 관측소가 다음 사이트를 위한 HTTPS 인증서에 대한 경고를 보내왔습니다."> +<!ENTITY ssl-observatory.warning.defense "만약 이 사이트에 로그인되어 있다면, 안전한 연결에 일단 연결한 뒤, 비밀번호를 바꾸는 것이 권장됩니다."> + +<!ENTITY ssl-observatory.prefs.self_signed +"자신-서명 인증서 확인 및 제보"> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +"이것은 추천됩니다: 암호화 문제는 자기 서명된 임베디드 장치에서 특히 일반적입니다.">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 13 Jul '12

13 Jul '12

commit e193932055f5d6d0850e19f8bd5a1574e85bb9e4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 13 09:45:32 2012 +0000 Update translations for https_everywhere --- ko/ssl-observatory.dtd | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ko/ssl-observatory.dtd b/ko/ssl-observatory.dtd index 727e44d..e6821f5 100644 --- a/ko/ssl-observatory.dtd +++ b/ko/ssl-observatory.dtd @@ -39,7 +39,7 @@ to turn it on?">--> "새로운 인증서를 볼 때, 어떤 ISP에 연결되어 있는지 관측소에 말하십시오."> <!ENTITY ssl-observatory.prefs.asn_tooltip -""> +"이것은 귀하의 네트워크의 "자율 시스템 번호"를 수집하고 전송할 것입니다. 이것은 우리가 HTTPS에 대항하는 공격을 찾는 것에 대해 도움을 줄 것입니다. 그리고 우리는 공격이 비교적 일반적인 이란과 시리아와 같은 장소에서 네트워크에서 관측소를 가지고 있는지에 대한 여부를 확인하는 데 도움이 될 것입니다."> <!ENTITY ssl-observatory.prefs.done "완료"> @@ -54,7 +54,7 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.prefs.explanation2 -""> +"예를 들어, https://www.something.com을 방문할 때, 관측소에서 받은 인증서는 누가 사이트를 방문했는지가 아닌, 누가 www.something.com을 방문했거나, 그들이 본 특정한 페이지 키를 표시할 것입니다. 더 많은 세부사항을 위해 옵션을 선택하십시오."> <!ENTITY ssl-observatory.prefs.hide "고급 설정 숨기기"> @@ -62,13 +62,13 @@ Mouseover the options for further details:">--> "Tor가 가능하지 않더라도 인증서 확인"> <!ENTITY ssl-observatory.prefs.nonanon_tooltip -""> +"우리는 계속 데이터를 익명으로 보내겠지만, 이 선택은 덜 보안적입니다."> <!ENTITY ssl-observatory.prefs.priv_dns "non-public DNS 이름을 위한 인증서 확인과 제출"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip -""> +"이 옵션이 선택되지 않는다면, 관측소는 DNS 시스템을 통해 분석될 수 없는 인증서를 기록하지 않을 것입니다."> <!ENTITY ssl-observatory.prefs.show "고급 설정 보이기">

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 13 Jul '12

13 Jul '12

commit fefde1744ccf5812a83e7c8c87277714104ca673 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 13 09:45:08 2012 +0000 Update translations for orbot --- values-ko/strings.xml | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/values-ko/strings.xml b/values-ko/strings.xml index 406c4f6..8a11b29 100644 --- a/values-ko/strings.xml +++ b/values-ko/strings.xml @@ -39,14 +39,14 @@ <string name="pref_transparent_all_summary">토르를 통한 모든 응용 프로그램에 대한 프록시 트래픽</string> <string name="pref_transparent_port_fallback_title">포트 프록시 대체</string> <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string> - <string name="pref_transparent_port_title">Port List</string> + <string name="pref_transparent_port_title">포트 목록</string> <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> <string name="pref_transparent_port_dialog">Enter ports to proxy</string> - <string name="pref_has_root">Request Root Access</string> + <string name="pref_has_root">루트 권한에 대한 접근 필요</string> <string name="pref_has_root_summary">Request root access for transparent proxying</string> - <string name="status_install_success">Tor binaries successfully installed!</string> - <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants(a)torproject.org</string> - <string name="title_error">Application Error</string> + <string name="status_install_success">Tor 바이너리가 성공적으로 설치됨!</string> + <string name="status_install_fail">Tor 바이너리 파일이 설치될 수 없습니다. Log를 확인해 주시고 tor-assistants(a)torproject.org 에 알려 주십시오.</string> + <string name="title_error">애플리케이션 오류</string> <string name="wizard_title">Orbot</string> <string name="wizard_btn_tell_me_more">Orbot 정보</string> <string name="btn_next">다음</string> @@ -66,15 +66,15 @@ <string name="wizard_permission_enable_root">Grant Root for Orbot</string> <string name="wizard_configure">Configure Torification</string> <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string> - <string name="wizard_configure_all">Proxy All Apps Through Tor</string> + <string name="wizard_configure_all">모든 App이 Tor를 사용하기</string> <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string> <string name="wizard_tips_tricks">Orbot-enabled Apps</string> <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later in the Android Market.</string> <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> - <string name="wizard_proxy_help_info">Proxy Settings</string> + <string name="wizard_proxy_help_info">프록시 설정</string> <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </string> - <string name="wizard_final">Orbot is ready!</string> + <string name="wizard_final">Orbot이 준비됨!</string> <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string>

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 13 Jul '12

13 Jul '12

commit 65dbfb0ebda910e53ba69b61ac32676e08f6a827 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 13 09:45:05 2012 +0000 Update translations for gettor --- ko/gettor.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ko/gettor.po b/ko/gettor.po index df5d164..3a79f0c 100644 --- a/ko/gettor.po +++ b/ko/gettor.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-07-10 02:19+0000\n" -"Last-Translator: pCsOrI <pcsori(a)gmail.com>\n" +"PO-Revision-Date: 2012-07-13 09:22+0000\n" +"Last-Translator: cwt96 <cwt967(a)naver.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -201,7 +201,7 @@ msgstr "지원\n=====" msgid "" "Here's your requested software as a zip file. Please unzip the\n" "package and verify the signature." -msgstr "" +msgstr "요청된 소프트웨어가 zip 파일로 있습니다. 압축을 풀어 주시고 서명을 확인해 주십시오." #: lib/gettor/i18n.py:136 msgid "" @@ -250,7 +250,7 @@ msgid "" "in the body of the email to the following email address:\n" "\n" " bridges(a)torproject.org" -msgstr "" +msgstr "\"get bridges\"라는 문구를 이메일 본문에 넣어 다음 주소에 보내면 귀하는 bridge를 얻을 수 있습니다.\n\n bridges(a)torproject.org" #: lib/gettor/i18n.py:167 msgid "" @@ -278,7 +278,7 @@ msgstr "패키지가 곧 도착할 것입니다. 모든 패키지를 압축을 msgid "" "It was successfully understood. Your request is currently being processed.\n" "Your package (%s) should arrive within the next ten minutes." -msgstr "" +msgstr "성공적으로 이해되었습니다. 귀하의 요청은 현재 진행중이며, 패키지(%s)는 다음 10분 내로 도착해야 합니다." #: lib/gettor/i18n.py:182 msgid ""

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 13 Jul '12

13 Jul '12

commit be85a4e965c95019de846eb763fe9fa72e77f52c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 13 09:15:31 2012 +0000 Update translations for https_everywhere --- ko/ssl-observatory.dtd | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ko/ssl-observatory.dtd b/ko/ssl-observatory.dtd index d6f8e4c..727e44d 100644 --- a/ko/ssl-observatory.dtd +++ b/ko/ssl-observatory.dtd @@ -44,7 +44,8 @@ to turn it on?">--> <!ENTITY ssl-observatory.prefs.done "완료"> <!ENTITY ssl-observatory.prefs.explanation -""> +"HTTPS Everywhere은 EFF의 SSL 관측소를 사용할 수 있습니다. 이것은 두 가지 일을 합니다: (1) +중간자 공격을 감지하고 웹의 보안을 향상시키는 것을 돕기 위해, HTTPS 인증서의 복사본을 SSL 관측소로 보냅니다. 그리고 (2) 우리가 귀하에게 보안적이지 않는 연결이나 브라우저에 대한 공격에 대해 경고하도록 합니다.">  ""> <!ENTITY ssl-observatory.prefs.priv_dns -""> +"non-public DNS 이름을 위한 인증서 확인과 제출"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip "">

1 0

[metrics-web/master] Update ExoneraTor text based on wseltzer's edits.
by karsten＠torproject.org 13 Jul '12

13 Jul '12

commit 6515e1631fad121d310f89905c4adae1f4e7adbf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jul 13 08:49:35 2012 +0200 Update ExoneraTor text based on wseltzer's edits. --- .../torproject/ernie/web/ExoneraTorServlet.java | 42 ++++++++++++++------ 1 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/org/torproject/ernie/web/ExoneraTorServlet.java b/src/org/torproject/ernie/web/ExoneraTorServlet.java index 4feaaba..d353c7b 100644 --- a/src/org/torproject/ernie/web/ExoneraTorServlet.java +++ b/src/org/torproject/ernie/web/ExoneraTorServlet.java @@ -101,24 +101,42 @@ public class ExoneraTorServlet extends HttpServlet { + " <div class=\"main-column\" style=\"margin:5; " + "Padding:0;\">\n" + " <h2>ExoneraTor</h2>\n" - + " <h3>or: a website that tells you whether some IP " + + " <h3>or: a website that tells you whether a given IP " + "address was a Tor relay</h3>\n" + + " <br>\n" + + " <p>Just because you see an Internet connection from a " + + "particular IP address does not mean you know <i>who</i> " + + "originated the traffic. Tor anonymizes Internet traffic by " + + "\"<a href=\"https://www.torproject.org/about/overview" + + "#thesolution\">onion routing</a>,\" sending packets " + + "through a series of encrypted hops before they reach their " + + "destination. Therefore, if you see traffic from a Tor node, " + + "you may be seeing traffic that originated from someone " + + "using Tor, rather than from the node operator itself. The " + + "Tor Project and Tor node operators have no records of the " + + "traffic that passes over the network, but we do maintain " + + "current and historical records of which IP addresses are " + + "part of the Tor network.</p>\n" + + " <br>\n" + " <p>ExoneraTor tells you whether there was a Tor relay " + "running on a given IP address at a given time. ExoneraTor " - + "can further find out whether this relay permitted exiting " - + "to a given server and/or TCP port. ExoneraTor learns about " - + "these facts from parsing the public relay lists and relay " + + "can further indicate whether this relay permitted exiting " + + "to a given server and/or TCP port. ExoneraTor learns these " + + "facts by parsing the public relay lists and relay " + "descriptors that are collected from the Tor directory " - + "authorities and the exit lists collected by TorDNSEL.</p>\n" + + "authorities and the exit lists collected by TorDNSEL. By " + + "inputting an IP address and time, you can determine whether " + + "that IP was then a part of the Tor network.</p>\n" + " <br>\n" + " <p><font color=\"red\"><b>Notice:</b> Note that the " - + "information you are providing below may be leaked to anyone " - + "who can read the network traffic between you and this web " - + "server or who has access to this web server. If you need to " - + "keep the IP addresses and incident times confidential, you " - + "should download the <a href=\"tools.html#exonerator\">Java " - + "or Python version of ExoneraTor</a> and run it on your " - + "local machine.</font></p>\n" + + "information you are providing below may be visible to " + + "anyone who can read the network traffic between you and " + + "this web server or who has access to this web server. For " + + "greater confidentiality of the IP addresses and incident " + + "times, you should download the " + + "<a href=\"tools.html#exonerator\">Java or Python version of " + + "ExoneraTor</a> and run it on your local " + + "machine.</font></p>\n" + " <br>\n"); }

1 0

[ooni-probe/master] Implement censorship detection for fingerprint
by art＠torproject.org 11 Jul '12

11 Jul '12

commit d249c7ff695b0efdb4dd23a0a4bc6756024f7f19 Author: Arturo Filastò <hellais(a)torproject.org> Date: Wed Jul 11 12:37:23 2012 +0200 Implement censorship detection for fingerprint * Move part of b0wser to a ooni protocol --- ooni/protocols/b0wser.py | 104 ++++++++++++++++++++++++++++++++++++++++ oonib/b0wser.py | 118 ++++++++++++---------------------------------- 2 files changed, 134 insertions(+), 88 deletions(-) diff --git a/ooni/protocols/b0wser.py b/ooni/protocols/b0wser.py new file mode 100644 index 0000000..ae6b002 --- /dev/null +++ b/ooni/protocols/b0wser.py @@ -0,0 +1,104 @@ +from ooni.utils import log + +class Mutator: + idx = 0 + step = 0 + + waiting = False + waiting_step = 0 + + def __init__(self, steps): + """ + @param steps: array of dicts containing as keys data and wait. Data is + the content of the ith packet to be sent and wait is how + much we should wait before mutating the packet of the + next step. + """ + self.steps = steps + + def _mutate(self, data, idx): + """ + Mutate the idx bytes by increasing it's value by one + + @param data: the data to be mutated. + + @param idx: what byte should be mutated. + """ + print "idx: %s, data: %s" % (idx, data) + ret = data[:idx] + ret += chr(ord(data[idx]) + 1) + ret += data[idx+1:] + return ret + + def state(self): + """ + Return the current mutation state. As in what bytes are being mutated. + + Returns a dict containg the packet index and the step number. + """ + return {'idx': self.idx, 'step': self.step} + + def next_mutation(self): + """ + Increases by one the mutation state. + + ex. (* is the mutation state, i.e. the byte to be mutated) + before [___*] [____] + step1 step2 + after [____] [*___] + + Should be called every time you need to proceed onto the next mutation. + It changes the internal state of the mutator to that of the next + mutatation. + + returns True if another mutation is available. + returns False if all the possible mutations have been done. + """ + if self.step > len(self.steps): + self.waiting = True + return False + + self.idx += 1 + current_idx = self.idx + current_step = self.step + current_data = self.steps[current_step]['data'] + data_to_receive = self.steps[current_step]['wait'] + + if self.waiting and self.waiting_step == data_to_receive: + log.debug("I am no longer waiting.") + self.waiting = False + self.waiting_step = 0 + self.idx = 0 + + elif self.waiting: + log.debug("Waiting some more.") + self.waiting_step += 1 + + elif current_idx >= len(current_data): + log.debug("Entering waiting mode.") + self.step += 1 + self.idx = 0 + self.waiting = True + log.debug("current index %s" % current_idx) + log.debug("current data %s" % len(current_data)) + return True + + def get_mutation(self, step): + """ + Returns the current packet to be sent to the wire. + If no mutation is necessary it will return the plain data. + Should be called when you are interested in obtaining the data to be + sent for the selected state. + + @param step: the current step you want the mutation for + + returns the mutated packet for the specified step. + """ + if step != self.step or self.waiting: + log.debug("I am not going to do anything :)") + return self.steps[step]['data'] + + data = self.steps[step]['data'] + print "Mutating %s with idx %s" % (data, self.idx) + return self._mutate(data, self.idx) + diff --git a/oonib/b0wser.py b/oonib/b0wser.py index 186c9a4..6da1997 100644 --- a/oonib/b0wser.py +++ b/oonib/b0wser.py @@ -1,100 +1,19 @@ from twisted.internet import protocol +from twisted.internet.error import ConnectionDone -class Mutator: - idx = 0 - step = 0 - - waiting = False - waiting_step = 0 - - def __init__(self, steps): - self.steps = steps - - def _mutate(self, data, idx): - """ - Mutate the idx bytes by increasing it's value by one - - @param data: the data to be mutated. - - @param idx: what byte should be mutated. - """ - print "idx: %s, data: %s" % (idx, data) - ret = data[:idx] - ret += chr(ord(data[idx]) + 1) - ret += data[idx+1:] - return ret - - def next_mutation(self): - """ - Increases by one the mutation state. - - ex. (* is the mutation state, i.e. the byte to be mutated) - before [___*] [____] - step1 step2 - after [____] [*___] - - Should be called every time you need to proceed onto the next mutation. - It changes the internal state of the mutator to that of the next - mutatation. - - returns True if another mutation is available. - returns False if all the possible mutations have been done. - """ - if self.step > len(self.steps): - self.waiting = True - return False - - self.idx += 1 - current_idx = self.idx - current_step = self.step - current_data = self.steps[current_step]['data'] - data_to_receive = self.steps[current_step]['wait'] - - if self.waiting and self.waiting_step == data_to_receive: - print "I am no longer waiting..." - self.waiting = False - self.waiting_step = 0 - self.idx = 0 - - elif self.waiting: - print "Waiting some more..." - self.waiting_step += 1 - - elif current_idx >= len(current_data): - print "Entering waiting mode..." - self.step += 1 - self.idx = 0 - self.waiting = True - print "current index %s current data %s" % (current_idx, len(current_data)) - return True - - def get_mutation(self, state): - """ - Returns the current packet to be sent to the wire. - If no mutation is necessary it will return the plain data. - Should be called when you are interested in obtaining the data to be - sent for the selected state. - - @param step: the current step you want the mutation for - - returns the mutated packet for the specified step. - """ - if step != self.step or self.waiting: - print "I am not going to do anything :)" - return self.steps[step]['data'] - - data = self.steps[step]['data'] - print "Mutating %s with idx %s" % (data, self.idx) - return self._mutate(data, self.idx) +from ooni.plugoo import reports +from ooni.protocols.b0wser import Mutator class B0wserProtocol(protocol.Protocol): steps = [{'data': "STEP1", 'wait': 4}, {'data': "STEP2", 'wait': 4}, {'data': "STEP3", 'wait': 4}] - mutator = None + state = 0 + total_states = len(steps) - 1 received_data = 0 + report = reports.Report('b0wser', 'b0wser.yamlooni') def next_state(self): data = self.mutator.get_mutation(self.state) @@ -111,6 +30,28 @@ class B0wserProtocol(protocol.Protocol): print "Moving to next state %s" % self.state self.next_state() + def censorship_detected(self, report): + print "The connection was closed because of %s" % report['reason'] + print "I may have matched the censorship fingerprint" + print "State %s, Mutator %s" % (report['proto_state'], + report['mutator_state']) + self.report(report) + + + def connectionLost(self, reason): + report = {'reason': reason, 'proto_state': self.state, + 'mutator_state': self.mutator.state(), 'trigger': None} + + if self.state < self.total_states: + report['trigger'] = 'did not finish state walk' + self.censorship_detected(report) + + if reason.check(ConnectionDone): + print "Connection closed cleanly" + else: + report['trigger'] = 'unclean connection closure' + self.censorship_detected(report) + class B0wserServer(protocol.ServerFactory): protocol = B0wserProtocol mutations = {} @@ -122,7 +63,8 @@ class B0wserServer(protocol.ServerFactory): self.mutations[addr.host] = Mutator(p.steps) else: print "Moving on to next mutation" - self.mutations[addr.host].next_mutation() + if not self.mutations[addr.host].next_mutation(): + self.mutations.pop(addr.host) p.mutator = self.mutations[addr.host] return p

1 0