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

[stem/master] Clarifying why test's load_conf() expects an exception
by atagar＠torproject.org 24 Jun '13

24 Jun '13

commit 5f65f786dee22089323febc899bf2c85a53c99aa Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jun 24 09:23:16 2013 -0700 Clarifying why test's load_conf() expects an exception For a long while I've been puzzled why this load_conf() call asserted an exception. When I ran it in a cusom prompt it ran fine - turned out that it was relying on us having a custom DataDir. Tor balks (rightfully) when we'd shift our DataDir out from a running tor instance. Doing a better job explaining what's up in the comment. --- test/integ/control/controller.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index bc9619c..c4b8fb1 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -545,7 +545,14 @@ class TestController(unittest.TestCase): oldconf = runner.get_torrc_contents() try: - # invalid requests + # Check a request that changes our DataDir. Tor should rightfully balk + # at this... + # + # InvalidRequest: Transition not allowed: Failed to parse/validate + # config: While Tor is running, changing DataDirectory + # ("/home/atagar/Desktop/stem/test/data"->"/home/atagar/.tor") is not + # allowed. + self.assertRaises(stem.InvalidRequest, controller.load_conf, "ContactInfo confloaded") try:

1 0

[tor/master] Fix #5584 - raise awareness of safer logging - warn about potentially unsafe config options
by nickm＠torproject.org 24 Jun '13

24 Jun '13

commit 10480dff01bece13fabb1d81fa847f95c3e839f0 Author: Marek Majkowski <marek(a)popcount.org> Date: Thu Jun 13 17:29:14 2013 +0100 Fix #5584 - raise awareness of safer logging - warn about potentially unsafe config options --- changes/bug5584 | 4 ++++ src/or/config.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/changes/bug5584 b/changes/bug5584 new file mode 100644 index 0000000..a81be00 --- /dev/null +++ b/changes/bug5584 @@ -0,0 +1,4 @@ + o Minor features: + - Raise awareness of safer logging - notice user of potentially + unsafe configuration options: logging above "notice" or + clearning SafeLogging flag. Fixes #5584. diff --git a/src/or/config.c b/src/or/config.c index e3ffbf2..09cbdcf 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1005,6 +1005,7 @@ options_act_reversible(const or_options_t *old_options, char **msg) int set_conn_limit = 0; int r = -1; int logs_marked = 0; + int old_min_log_level = get_min_log_level(); /* Daemonize _first_, since we only want to open most of this stuff in * the subprocess. Libevent bases can't be reliably inherited across @@ -1153,6 +1154,13 @@ options_act_reversible(const or_options_t *old_options, char **msg) control_adjust_event_log_severity(); tor_free(severity); } + if (get_min_log_level() >= LOG_INFO && + get_min_log_level() != old_min_log_level) { + log_warn(LD_GENERAL, "Your log may contain sensitive information - you're " + "logging above \"notice\". Please log safely. Don't log unless " + "it serves an important reason. Overwrite the log afterwards."); + } + SMARTLIST_FOREACH(replaced_listeners, connection_t *, conn, { log_notice(LD_NET, "Closing old %s on %s:%d", @@ -1335,6 +1343,13 @@ options_act(const or_options_t *old_options) } #endif + if (options->SafeLogging_ != SAFELOG_SCRUB_ALL && + (!old_options || old_options->SafeLogging_ != options->SafeLogging_)) { + log_warn(LD_GENERAL, "Your log may contain sensitive information - you " + "disabled SafeLogging. Please log safely. Don't log unless it " + "serves an important reason. Overwrite the log afterwards."); + } + if (options->Bridges) { mark_bridge_list(); for (cl = options->Bridges; cl; cl = cl->next) {

1 0

[tor-browser-bundle/master] Include GeoIP file in bundles.
by mikeperry＠torproject.org 24 Jun '13

24 Jun '13

commit 313346c958be18de5e8f77d38ea45d5b4b93657c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jun 24 03:07:59 2013 -0700 Include GeoIP file in bundles. Fixes some EntryNode issues people ran into. --- gitian/descriptors/linux/gitian-tor.yml | 4 +++- gitian/descriptors/mac/gitian-tor.yml | 2 ++ gitian/descriptors/windows/gitian-tor.yml | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 2901274..2ab9b20 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -41,6 +41,7 @@ script: | export DEB_BUILD_HARDENING_PIE=1 # mkdir -p $INSTDIR/App + mkdir -p $INSTDIR/Data/Tor/ mkdir -p $INSTDIR/Lib/libz/ # cd zlib @@ -80,7 +81,8 @@ script: | make install cd .. install -s $INSTDIR/bin/tor $INSTDIR/App/ + cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/ # cd $INSTDIR - ~/build/dzip.sh tor-linux$GBUILD_BITS-gbuilt.zip App/ Lib/ + ~/build/dzip.sh tor-linux$GBUILD_BITS-gbuilt.zip Data/ App/ Lib/ cp tor-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 537202f..d2ccd90 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -45,6 +45,7 @@ script: | # mkdir -p $INSTDIR/bin/ mkdir -p $INSTDIR/TorBrowserBundle.app/Contents/MacOS/ + mkdir -p $INSTDIR/TorBrowserBundle.app/Contents/Resources/Data/Tor/ mkdir -p $OUTDIR/ # sudo dpkg -i *.deb @@ -90,6 +91,7 @@ script: | make install cd .. cp $INSTDIR/bin/tor $INSTDIR/TorBrowserBundle.app/Contents/MacOS/ + cp $INSTDIR/share/tor/geoip $INSTDIR/TorBrowserBundle.app/Contents/Resources/Data/Tor/ cd $INSTDIR/TorBrowserBundle.app/Contents/MacOS/ i686-apple-darwin11-install_name_tool -change /home/ubuntu/install/libevent/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor # XXX: Geoip files.. diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 5fb0ef5..aec8c30 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -39,6 +39,7 @@ script: | # mkdir -p $INSTDIR/bin/ mkdir -p $INSTDIR/App/ + mkdir -p $INSTDIR/Data/Tor/ mkdir -p $OUTDIR/ # cd zlib @@ -76,11 +77,12 @@ script: | make install cd .. install -s $INSTDIR/bin/tor.exe $INSTDIR/App/ + cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/ # XXX: Geoip files.. # cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libgcc_s_sjlj-1.dll $INSTDIR/App/ cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libssp*.dll $INSTDIR/App/ # cd $INSTDIR - ~/build/dzip.sh tor-win32-gbuilt.zip App/ + ~/build/dzip.sh tor-win32-gbuilt.zip App/ Data/ cp tor-win32-gbuilt.zip $OUTDIR/

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 24 Jun '13

24 Jun '13

commit f47e0277bb486f89960048691494f33bc670e72f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 24 07:46:25 2013 +0000 Update translations for torbirdy_completed --- ko/torbirdy.dtd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ko/torbirdy.dtd b/ko/torbirdy.dtd index 4d6b51f..2ed1f64 100644 --- a/ko/torbirdy.dtd +++ b/ko/torbirdy.dtd @@ -16,6 +16,8 @@ <!ENTITY torbirdy.prefs.extra2.key "g"> <!ENTITY torbirdy.prefs.proxy.label "프록시 설정"> <!ENTITY torbirdy.prefs.privacy.label "개인 정보 설정"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail 설정"> +<!ENTITY torbirdy.prefs.security.label " 보안 설정"> <!ENTITY torbirdy.prefs.recommended.text "Torbirdy를 위한 추천되는 프록시 설정을 사용합니다."> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "익명화 서비스 선택"> @@ -41,9 +43,13 @@ <!ENTITY torbirdy.prefs.confirmemail.key "m"> <!ENTITY torbirdy.prefs.emailwizard.label "썬더버드의 자동 이메일 환경설정 마법사 활성화 [기본값 : 비활성화]"> <!ENTITY torbirdy.prefs.emailwizard.key "w"> +<!ENTITY torbirdy.prefs.renegotiation.label "SSL/TLS가 호환되지 않는 사이트에의 비보호 접근을 허용 [기본 설정: 비허용]"> +<!ENTITY torbirdy.prefs.renegotiation.key "r"> <!ENTITY torbirdy.prefs.account_specific "계정-특징적"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "계정 선택 : "> +<!ENTITY torbirdy.prefs.enigmail.keyserver.label "사용할 키서버:"> +<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> <!ENTITY torbirdy.panel.usetor.label "Tor Onion Router 사용"> <!ENTITY torbirdy.panel.usejondo.label "JonDo 사용 (프리미엄)">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 24 Jun '13

24 Jun '13

commit 94191034451c25cdc1a4a82809e1d5f9d7a2c03a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 24 07:46:21 2013 +0000 Update translations for torbirdy --- ko/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/torbirdy.dtd b/ko/torbirdy.dtd index 1b537bc..2ed1f64 100644 --- a/ko/torbirdy.dtd +++ b/ko/torbirdy.dtd @@ -43,7 +43,7 @@ <!ENTITY torbirdy.prefs.confirmemail.key "m"> <!ENTITY torbirdy.prefs.emailwizard.label "썬더버드의 자동 이메일 환경설정 마법사 활성화 [기본값 : 비활성화]"> <!ENTITY torbirdy.prefs.emailwizard.key "w"> -<!ENTITY torbirdy.prefs.renegotiation.label ""> +<!ENTITY torbirdy.prefs.renegotiation.label "SSL/TLS가 호환되지 않는 사이트에의 비보호 접근을 허용 [기본 설정: 비허용]"> <!ENTITY torbirdy.prefs.renegotiation.key "r"> <!ENTITY torbirdy.prefs.account_specific "계정-특징적"> <!ENTITY torbirdy.prefs.select_account.key "C">

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 24 Jun '13

24 Jun '13

commit 76540d9eb3f61e283e1a92bc2294be8c732dc712 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 24 07:45:25 2013 +0000 Update translations for vidalia_alpha --- ko/vidalia_ko.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/ko/vidalia_ko.po b/ko/vidalia_ko.po index 9876ae5..a4fd8f8 100644 --- a/ko/vidalia_ko.po +++ b/ko/vidalia_ko.po @@ -1,13 +1,14 @@ # # Translators: # pCsOrI <pcsori(a)gmail.com>, 2012 +# ssw0061 <ssw0061(a)yandex.com>, 2013 msgid "" 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: 2013-06-24 07:10+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-06-24 07:30+0000\n" +"Last-Translator: ssw0061 <ssw0061(a)yandex.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +19,7 @@ msgstr "" msgctxt "AboutDialog" msgid "About Vidalia" -msgstr "Vidalia 정보" +msgstr "Vidalia가 무엇인가요?" msgctxt "AboutDialog" msgid "License" @@ -487,20 +488,20 @@ msgctxt "ControlPasswordInputDialog" msgid "" "Vidalia can try to restart Tor for you. Doing so will close all currently " "active connections through your Tor process." -msgstr "" +msgstr "Vidalia가 자동으로 Tor 브라우저를 재시작 할 수 있습니다. 이 경우 Vidalia는 Tor 브라우저 프로세스와 관련된 인터넷 연결을 모두 종료합니다." msgctxt "ControlPasswordInputDialog" msgid "" "Tor is already running, but Vidalia can't connect to it.\n" "\n" "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor." -msgstr "" +msgstr "토르 브라우저가 이미 실행되고 있지만 Vidalia가 토르 브라우저에 연결할 수 없습니다.⏎\n⏎\n이 오류는 다른 프로세스(이미 활성화된 Vidalia 프로세스 혹은 Vidalia 프로세서가 실행 중 오류로 작동 정지한 상태에서 실행중일 경우 등)에서 토르 브라우저를 사용 중이기 때분에 발생할 수 있습니다." msgctxt "ControlPasswordInputDialog" msgid "" "You will need to shut down the Tor process before Vidalia can launch a new " "one." -msgstr "" +msgstr "Vidalia를 사용하기 위해서는 기존의 Tor 브라우저의 프로세서를 강제로 종료해야 합니다.(작업 관리자에서 이 작업을 실행할 수 있습니다)" msgctxt "ControlSocket" msgid "Control socket is not connected." @@ -1970,7 +1971,7 @@ msgstr "이 연결을 통해 보낸 아무것이나 모니터링 할 수 있습 msgctxt "MainWindow" msgid "toolBar" -msgstr "" +msgstr "툴바" msgctxt "MainWindow" msgid "Restart" @@ -1978,7 +1979,7 @@ msgstr "" msgctxt "MainWindow" msgid "Reload Tor's config" -msgstr "" +msgstr "설정 초기화" msgctxt "MainWindow" msgid "Actions" @@ -1992,7 +1993,7 @@ msgctxt "MainWindow" msgid "" "Vidalia tried to restart Tor, but was not able to. Please check your Task " "Manager to ensure there are no other Tor processes running." -msgstr "" +msgstr "Vidalia가 Tor 브라우저를 재시작하려고 시도했으나, 프로세스에 대한 액세스가 거부되었습니다. 관리자 권한이 없을 경우 이 오류가 발생할 수 있으며, Windows 작업 관리자에서 수동적으로 Tor 브라우저 관련 프로세스를 종료해야 합니다." msgctxt "MainWindow" msgid "Error reloading configuration"

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 24 Jun '13

24 Jun '13

commit 59da04c32de3a481b0860a4cda6e36a142a905e6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 24 07:45:22 2013 +0000 Update translations for vidalia_completed --- ko/vidalia_ko.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/vidalia_ko.po b/ko/vidalia_ko.po index bb6ec91..0ec481e 100644 --- a/ko/vidalia_ko.po +++ b/ko/vidalia_ko.po @@ -10,7 +10,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:52+0000\n" -"PO-Revision-Date: 2013-06-24 07:10+0000\n" +"PO-Revision-Date: 2013-06-24 07:30+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 24 Jun '13

24 Jun '13

commit 8b85ff83da10646e8ccab3fbc59b485f68a68331 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 24 07:45:18 2013 +0000 Update translations for vidalia --- ko/vidalia_ko.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/vidalia_ko.po b/ko/vidalia_ko.po index bb6ec91..0ec481e 100755 --- a/ko/vidalia_ko.po +++ b/ko/vidalia_ko.po @@ -10,7 +10,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:52+0000\n" -"PO-Revision-Date: 2013-06-24 07:10+0000\n" +"PO-Revision-Date: 2013-06-24 07:30+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 24 Jun '13

24 Jun '13

commit 3dd83107ec33f7bd4eaee918ac1b2c6d6350afcf Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 24 07:15:29 2013 +0000 Update translations for vidalia_alpha --- ko/vidalia_ko.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/vidalia_ko.po b/ko/vidalia_ko.po index 513d1f1..9876ae5 100644 --- a/ko/vidalia_ko.po +++ b/ko/vidalia_ko.po @@ -6,7 +6,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: 2013-05-30 23:40+0000\n" +"PO-Revision-Date: 2013-06-24 07:10+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 24 Jun '13

24 Jun '13

commit 1a79ed162b6202acd4d6ef5d5fde234312a09266 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 24 07:15:26 2013 +0000 Update translations for vidalia_completed --- ko/vidalia_ko.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/vidalia_ko.po b/ko/vidalia_ko.po index 50bea6d..bb6ec91 100644 --- a/ko/vidalia_ko.po +++ b/ko/vidalia_ko.po @@ -10,7 +10,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:52+0000\n" -"PO-Revision-Date: 2013-05-30 23:40+0000\n" +"PO-Revision-Date: 2013-06-24 07:10+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n"

1 0