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

[tor-browser-bundle/master] Update Firefox langpacks.
by mikeperry＠torproject.org 15 Nov '13

15 Nov '13

commit 4e512710227289621c316a40e589ac360d4a7620 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Nov 15 01:46:29 2013 -0800 Update Firefox langpacks. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index 644ed65..8306372 100755 --- a/gitian/versions +++ b/gitian/versions @@ -17,7 +17,7 @@ MINGW_REV=5830 GITIAN_TAG=tor-browser-builder-3.0-4 # OPENSSL_VER=1.0.1e -FIREFOX_LANG_VER=17.0.10esr +FIREFOX_LANG_VER=17.0.11esr BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 572b0f4..94ad2a4 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -17,7 +17,7 @@ MINGW_REV=5830 GITIAN_TAG=tor-browser-builder-3.0-4 # OPENSSL_VER=1.0.1e -FIREFOX_LANG_VER=24.1.0esr +FIREFOX_LANG_VER=24.1.1esr BINUTILS_VER=2.22 GCC_VER=4.6.3 PYTHON_VER=2.7.5

1 0

[tor-browser-bundle/master] Update versions for new Firefox releases.
by mikeperry＠torproject.org 15 Nov '13

15 Nov '13

commit a642a9c3b7ad36397a5d676747ffe82b364b5bec Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Nov 15 01:36:38 2013 -0800 Update versions for new Firefox releases. Also update Torbutton and Tor Launcher to pull in Japanese translations. --- gitian/versions | 10 +++++----- gitian/versions.alpha | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gitian/versions b/gitian/versions index 0fea02e..644ed65 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,13 +1,13 @@ -TORBROWSER_VERSION=3.0-beta-1 -BUNDLE_LOCALES="de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" +TORBROWSER_VERSION=3.0-rc-1 +BUNDLE_LOCALES="de es fa fr it ja ko nl pl pt ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-17.0.10esr-3.0beta1-build2 +TORBROWSER_TAG=tor-browser-17.0.11esr-3.0rc1-build1 TOR_TAG=tor-0.2.4.17-rc OPENSSL_TAG=openssl-101e-no-gmt-time-v1 -TORLAUNCHER_TAG=0.2.3.1-beta -TORBUTTON_TAG=1.6.4 +TORLAUNCHER_TAG=0.2.3.2-rc +TORBUTTON_TAG=1.6.4.1 HTTPSE_TAG=3.4.2 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index b605365..572b0f4 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,13 +1,13 @@ TORBROWSER_VERSION=3.5-alpha-1 -BUNDLE_LOCALES="de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" +BUNDLE_LOCALES="de es-ES fa fr ja it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=0 -TORBROWSER_TAG=tor-browser-24.1.0esr-1 +TORBROWSER_TAG=tor-browser-24.1.1esr-1 TOR_TAG=tor-0.2.4.17-rc OPENSSL_TAG=openssl-101e-no-gmt-time-v1 -TORLAUNCHER_TAG=0.2.3.1-beta -TORBUTTON_TAG=1.6.4 +TORLAUNCHER_TAG=0.2.3.2-rc +TORBUTTON_TAG=1.6.4.1 HTTPSE_TAG=3.4.2 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8

1 0

[tor-browser-bundle/master] Update Changelog for 3.0rc1.
by mikeperry＠torproject.org 15 Nov '13

15 Nov '13

commit 826602c972d5c5218380831d86d788bf32f78a4a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Nov 15 01:43:59 2013 -0800 Update Changelog for 3.0rc1. --- Bundle-Data/Docs/ChangeLog.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 71916eb..0ea2dad 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,14 @@ +Tor Browser Bundle 3.0rc1 -- Nov 15 2013 + * All Platforms: + * Bug #7277: TBB's Tor client will now omit its timestamp in the TLS handshake. + * Provide Japanese bundles + * Remove unsupported PDF.JS addon from the bundle + * Update Torbutton to 1.6.4.1 + * Bug #10002: Make the TBB3.0 blog tag our update download URL for now + * Linux + * Bug #10049: Fix architecture check to work from outside TBB's directory + * Bug #10126: Remove libz and firefox-bin, and strip unstripped binaries + Tor Browser Bundle 3.0beta1 -- Oct 31 2013 * All Platforms: * Update Firefox to 17.0.10esr

1 0

[torbutton/master] Update translations and add Japanese to locale list.
by mikeperry＠torproject.org 15 Nov '13

15 Nov '13

commit b7647f3117d67a9dc9754ef23e9b5a41a21728b0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Nov 15 01:32:51 2013 -0800 Update translations and add Japanese to locale list. --- src/chrome/locale/fr/aboutTor.dtd | 2 +- src/chrome/locale/ja/aboutTor.dtd | 85 +++++++++++++++++-------------- src/chrome/locale/ja/brand.dtd | 2 +- src/chrome/locale/ja/brand.properties | 10 ++-- src/chrome/locale/ja/browser.properties | 4 +- src/chrome/locale/ja/torbutton.dtd | 6 +-- src/chrome/locale/pl/aboutTor.dtd | 36 ++++++------- src/chrome/locale/pl/brand.dtd | 8 +-- src/chrome/locale/pl/brand.properties | 16 +++--- src/chrome/locale/pl/browser.properties | 6 +-- trans_tools/import-translations.sh | 2 +- 11 files changed, 93 insertions(+), 84 deletions(-) diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index 8327507..b43c4ff 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -68,6 +68,6 @@ <!ENTITY aboutTor.helpInfo5.label "Faire un don »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html"> -<!ENTITY aboutTor.footer.label "Le projet Tor est une organisation à but non lucratif (US 501(c)(3) dédiée à la recherche, le développement et l'éducation sur l'anonymat et la vie privée en ligne."> +<!ENTITY aboutTor.footer.label "Le projet Tor est une organisation à but non lucratif (US 501(c)(3)) dédiée à la recherche, le développement et l'éducation sur l'anonymat et la vie privée en ligne."> <!ENTITY aboutTor.learnMore.label "En savoir plus sur le projet Tor »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html"> diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd index 2fc51c6..1f96caf 100644 --- a/src/chrome/locale/ja/aboutTor.dtd +++ b/src/chrome/locale/ja/aboutTor.dtd @@ -4,61 +4,70 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title "About Tor"> +<!ENTITY aboutTor.title "Torについて"> -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> +<!ENTITY aboutTor.outOfDateTorOn.label "しかし、このブラウザは古いバージョンです。"> +<!ENTITY aboutTor.outOfDateTorOff.label "また、このブラウザは古いバージョンです。"> +<!ENTITY aboutTor.outOfDate2.label "オニオンをクリックして、Tor Browser Bundleのアップデートをダウンロードを選択"> -<!ENTITY aboutTor.check.label "Test Tor Network Settings"> +<!ENTITY aboutTor.check.label "Torのネットワーク設定をテストする"> -<!ENTITY aboutTor.success.label "Congratulations!"> -<!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> -<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> -<!ENTITY aboutTor.failure.label "Something Went Wrong!"> -<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> +<!ENTITY aboutTor.success.label "おめでとうございます!"> +<!ENTITY aboutTor.success2.label "このブラウザはTorを使用するように設定されています。"> +<!ENTITY aboutTor.success3.label "現在自由に匿名でインターネットをブラウズ出来ます。"> +<!ENTITY aboutTor.failure.label "何かがおかしいです!"> +<!ENTITY aboutTor.failure2.label "Torはこのブラウザでは動作しません。"> +<!ENTITY aboutTor.failure3prefix.label "サポートについては、お問い合わせください。"> <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label "."> -<!ENTITY aboutTor.search.label "Search"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> +<!ENTITY aboutTor.search.label "検索"> + + +<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search "> -<!ENTITY aboutTor.searchSP.privacy.label "securely"> -<!ENTITY aboutTor.searchDDG.privacy.label "securely"> -<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html?"> +<!ENTITY aboutTor.searchSP.privacy.beforeLink.label "検索"> +<!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "検索"> +<!ENTITY aboutTor.searchSP.privacy.label "安全に"> +<!ENTITY aboutTor.searchDDG.privacy.label "安全に"> +<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> - -<!ENTITY aboutTor.searchSP.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label " with "> -<!ENTITY aboutTor.searchSP.search.label "Startpage"> +<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> +<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> +<!ENTITY aboutTor.searchSP.search.beforeLink.label "一緒に"> +<!ENTITY aboutTor.searchDDG.search.beforeLink.label "一緒に"> +<!ENTITY aboutTor.searchSP.search.label "スタートページ"> <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> <!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> <!ENTITY aboutTor.searchSP.search.afterLink.label "."> <!ENTITY aboutTor.searchDDG.search.afterLink.label "."> -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> +<!ENTITY aboutTor.torInfo1.label "追加情報: "> +<!ENTITY aboutTor.torInfo2.label "国とIPアドレス:"> +<!ENTITY aboutTor.torInfo3.label "出口ノード:"> +<!ENTITY aboutTor.torInfo4.label "このサーバは、ビジターのあらゆる情報を記録しません。"> +<!ENTITY aboutTor.whatnextQuestion.label "次はなんですか？"> +<!ENTITY aboutTor.whatnextAnswer.label "Torだけが匿名にブラウズするのに必要というわけではありません! あなたの身元を安全に保つには、ブラウジングの習慣の一部を変える必要があるかもしれません。"> +<!ENTITY aboutTor.whatnext.label "匿名性を保つことについてのヒント"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> +<!ENTITY aboutTor.helpInfo1.label "あなたは助けられます!"> +<!ENTITY aboutTor.helpInfo2.label "Torネットワークをより高速でより強力にすることをたすけられる多くのやり方があります。"> +<!ENTITY aboutTor.helpInfo3.label "Torリレーノードを起動 »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »"> +<!ENTITY aboutTor.helpInfo4.label "ボランティアを志願する"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation »"> +<!ENTITY aboutTor.helpInfo5.label "寄付をする"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »"> +<!ENTITY aboutTor.footer.label "Tor Projectはオンラインの匿名性とプライバシーの研究と開発、教育を専門に行うアメリカ合衆国の501(c)(3)に基づく非営利団体です。"> +<!ENTITY aboutTor.learnMore.label "Tor Projectに関する詳細は »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> diff --git a/src/chrome/locale/ja/brand.dtd b/src/chrome/locale/ja/brand.dtd index 76e405d..72bd4a1 100644 --- a/src/chrome/locale/ja/brand.dtd +++ b/src/chrome/locale/ja/brand.dtd @@ -5,4 +5,4 @@ <!ENTITY brandShortName "TorBrowser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> +<!ENTITY trademarkInfo.part1 "FirefoxおよびFirefoxのロゴはMozilla財団の登録商標です。"> diff --git a/src/chrome/locale/ja/brand.properties b/src/chrome/locale/ja/brand.properties index 9ae168e..2f0fa2c 100644 --- a/src/chrome/locale/ja/brand.properties +++ b/src/chrome/locale/ja/brand.properties @@ -6,10 +6,10 @@ brandShortName=TorBrowser brandFullName=Tor Browser vendorShortName=Tor Project -homePageSingleStartMain=Firefox Start, a fast home page with built-in search -homePageImport=Import your home page from %S +homePageSingleStartMain=Firefoxを、ビルトインの検索で高速なホームページではじめる +homePageImport=%Sからあなたのホームページをインポートする -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=ホームページ選択 +homePageMigrationDescription=あなたが使用したいホームページを選択してください: -syncBrandShortName=Sync +syncBrandShortName=同期 diff --git a/src/chrome/locale/ja/browser.properties b/src/chrome/locale/ja/browser.properties index 295a03a..1c59f6e 100644 --- a/src/chrome/locale/ja/browser.properties +++ b/src/chrome/locale/ja/browser.properties @@ -5,9 +5,9 @@ browser.startup.homepage=about:tor spellchecker.dictionary=en_US # Default search engine -browser.search.defaultenginename=Startpage +browser.search.defaultenginename=スタートページ # Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage +browser.search.order.1=スタートページ browser.search.order.2=DuckDuckGo browser.search.order.3=Google diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index fd05971..37dc8a8 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -116,10 +116,10 @@ <!ENTITY torbutton.prefs.no_proxy_warning "警告: 以上のどんなホストネームの使用も避けてください"> <!ENTITY torbutton.prefs.spoofreresh "偽装更新"> <!ENTITY torbutton.prefs.refereroptions "リファラ偽装オプション"> -<!ENTITY torbutton.prefs.nospoof "リファラ偽装しない"> +<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)"> <!ENTITY torbutton.prefs.spoofroot "ページの含んでいるフォルダーを偽装する"> <!ENTITY torbutton.prefs.spoofdomain "ドメインをリファラとして偽装する"> -<!ENTITY torbutton.prefs.spoofblank "リファラを空白にする"> +<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> <!ENTITY torbutton.cookiedialog.title "Cookie保護を管理"> <!ENTITY torbutton.cookiedialog.lockCol "保護済み"> <!ENTITY torbutton.cookiedialog.domainCol "ホスト"> @@ -131,7 +131,7 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "保護されているもの以外削除"> <!ENTITY torbutton.cookiedialog.saveAllCookies "新しいCookieを保護"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "新しいCOokieを保護しない"> -<!ENTITY torbutton.prefs.disable_livemarks "Torの使用中ライブブックマークの更新を無効化"> +<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> <!ENTITY torbutton.prefs.dtd_recommended "(推奨)"> <!ENTITY torbutton.prefs.dtd_optional "(オプション)"> <!ENTITY torbutton.prefs.dtd_crucial "(重要)"> diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd index fe95c2d..2ac4a75 100644 --- a/src/chrome/locale/pl/aboutTor.dtd +++ b/src/chrome/locale/pl/aboutTor.dtd @@ -4,17 +4,17 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title "Informacje"> +<!ENTITY aboutTor.title "Informacje na temat Tor'a"> -<!ENTITY aboutTor.outOfDateTorOn.label "jednak ta przeglądarka jest nieaktualna."> -<!ENTITY aboutTor.outOfDateTorOff.label "Ponadto ta przeglądarka jest nieaktualna."> +<!ENTITY aboutTor.outOfDateTorOn.label "JEDNAK, ta przeglądarka jest nieaktualna."> +<!ENTITY aboutTor.outOfDateTorOff.label "PONADTO, ta przeglądarka jest nieaktualna."> <!ENTITY aboutTor.outOfDate2.label "Kliknij na cebulę, a następnie wybierz Pobierz aktualizację Tor Browser Bundle."> <!ENTITY aboutTor.check.label "Przetestuj Ustawienia Sieci Tor"> <!ENTITY aboutTor.success.label "Gratulacje!"> -<!ENTITY aboutTor.success2.label "Ta przeglądarka jest skonfigurowana do korzystania z Tor."> -<!ENTITY aboutTor.success3.label "Jesteś teraz swobodnie przeglądać internet anonimowo."> +<!ENTITY aboutTor.success2.label "Ta przeglądarka jest skonfigurowana do korzystania z Tor'a."> +<!ENTITY aboutTor.success3.label "Możesz teraz swobodnie przeglądać Internet anonimowo."> <!ENTITY aboutTor.failure.label "Coś poszło nie tak!"> <!ENTITY aboutTor.failure2.label "Tor nie działa w tej przeglądarce."> <!ENTITY aboutTor.failure3prefix.label "Aby uzyskać pomoc, prosimy o kontakt"> @@ -32,18 +32,18 @@ - The sentence contains two embedded links for "securely" and - the search engine ("Startpage" or "DuckDuckGo"). --> -<!ENTITY aboutTor.searchSPPost.link ""> +<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Szukaj"> <!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Szukaj"> <!ENTITY aboutTor.searchSP.privacy.label "bezpiecznie"> <!ENTITY aboutTor.searchDDG.privacy.label "bezpiecznie"> -<!ENTITY aboutTor.searchSP.privacy.link ""> +<!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> -<!ENTITY aboutTor.searchSP.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchDDG.privacy.afterLink.label ""> -<!ENTITY aboutTor.searchSP.search.beforeLink.label ""> -<!ENTITY aboutTor.searchDDG.search.beforeLink.label ""> +<!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> +<!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> +<!ENTITY aboutTor.searchSP.search.beforeLink.label "z"> +<!ENTITY aboutTor.searchDDG.search.beforeLink.label "z"> <!ENTITY aboutTor.searchSP.search.label "Strona startowa"> <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> @@ -51,17 +51,17 @@ <!ENTITY aboutTor.searchSP.search.afterLink.label "."> <!ENTITY aboutTor.searchDDG.search.afterLink.label "."> -<!ENTITY aboutTor.torInfo1.label "Informatii suplimentare:"> +<!ENTITY aboutTor.torInfo1.label "Dodatkowe informacje:"> <!ENTITY aboutTor.torInfo2.label "Kraj i adres IP:"> -<!ENTITY aboutTor.torInfo3.label "Węzła Wyjściowe:"> +<!ENTITY aboutTor.torInfo3.label "Węzeł Wyjściowy:"> <!ENTITY aboutTor.torInfo4.label "Ten serwer nie rejestruje żadnych informacji o odwiedzających."> <!ENTITY aboutTor.whatnextQuestion.label "Co dalej?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor NIE jest wszystko, czego potrzebujesz, aby przeglądać anonimowo! Może trzeba będzie zmienić niektóre ustawienia, aby zapewnić tożsamość pozostaje bezpieczny."> -<!ENTITY aboutTor.whatnext.label "Porady Na Temat Pobytu Anonimowy »"> +<!ENTITY aboutTor.whatnextAnswer.label "Tor, to NIE jest wszystko czego potrzebujesz, aby przeglądać sieć anonimowo! Być może potrzeba będzie zmienić niektóre Twoje nawyki internetowe, aby zapewnić Twojej tożsamości bezpieczeństwo."> +<!ENTITY aboutTor.whatnext.label "Porady: Jak pozostać anonimowym w internecie »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "Ty możesz pomóc!"> -<!ENTITY aboutTor.helpInfo2.label "Istnieje wiele sposobów, możesz pomóc uczynić sieć Tora Będzie szybsza i silniejsza:"> -<!ENTITY aboutTor.helpInfo3.label "Uruchom Węzeł Tora Przekaźnik »"> +<!ENTITY aboutTor.helpInfo1.label "Możesz pomóc!"> +<!ENTITY aboutTor.helpInfo2.label "Istnieje wiele sposobów, abyś mógł uczynić sieć Tor'a szybszą i silniejszą:"> +<!ENTITY aboutTor.helpInfo3.label "Uruchom Przekaźnikowy Węzeł Tora »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> <!ENTITY aboutTor.helpInfo4.label "Wolontariat Swoje Usługi »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> diff --git a/src/chrome/locale/pl/brand.dtd b/src/chrome/locale/pl/brand.dtd index e34f480..4cc23fd 100644 --- a/src/chrome/locale/pl/brand.dtd +++ b/src/chrome/locale/pl/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName ""> -<!ENTITY brandFullName ""> -<!ENTITY vendorShortName ""> -<!ENTITY trademarkInfo.part1 ""> +<!ENTITY brandShortName "PrzeglądarkaTor'a"> +<!ENTITY brandFullName "Przeglądarka Tor'a"> +<!ENTITY vendorShortName "Project Tor"> +<!ENTITY trademarkInfo.part1 "Firefox i jego loga są znakami towarowymi Mozilla Foundation."> diff --git a/src/chrome/locale/pl/brand.properties b/src/chrome/locale/pl/brand.properties index 6598ccd..6283369 100644 --- a/src/chrome/locale/pl/brand.properties +++ b/src/chrome/locale/pl/brand.properties @@ -2,14 +2,14 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# brandShortName=TorBrowser -# brandFullName=Tor Browser -# vendorShortName=Tor Project +brandShortName=PrzeglądarkaTor'a +brandFullName=Przeglądarka Tor'a +vendorShortName=Project Tor -# homePageSingleStartMain=Firefox Start, a fast home page with built-in search -# homePageImport=Import your home page from %S +homePageSingleStartMain=Firefox Start, szybka strona domowa z wbudowana wyszukiwarką +homePageImport=importuj Twoją stronę domową z %S -# homePageMigrationPageTitle=Home Page Selection -# homePageMigrationDescription=Please select the home page you wish to use: +homePageMigrationPageTitle=Wybór Strony Domowej +homePageMigrationDescription=Proszę wybierz stronę domową którą chcesz używać: -# syncBrandShortName=Sync +syncBrandShortName=Synchronizuj diff --git a/src/chrome/locale/pl/browser.properties b/src/chrome/locale/pl/browser.properties index f5df9f3..9d1593f 100644 --- a/src/chrome/locale/pl/browser.properties +++ b/src/chrome/locale/pl/browser.properties @@ -1,8 +1,8 @@ # Default home page -# browser.startup.homepage=about:tor +browser.startup.homepage=about:tor # Spell checker dictionary -# spellchecker.dictionary=en_US +spellchecker.dictionary=en_US # Default search engine browser.search.defaultenginename=Strona startowa @@ -10,4 +10,4 @@ browser.search.defaultenginename=Strona startowa # Search engine order (order displayed in the search bar dropdown) browser.search.order.1=Strona startowa browser.search.order.2=DuckDuckGo -# browser.search.order.3=Google +browser.search.order.3=Google diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index f95398e..7f0d1fa 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,7 +2,7 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="de es fa fr it ko nl pl pt ru vi zh-CN" +BUNDLE_LOCALES="de es fa fr it ja ko nl pl pt ru vi zh-CN" if [ -d translation ]; then

1 0

[torbutton/master] Bug #10002: Make the update URL point directly at the TBB3.0 blog tag.
by mikeperry＠torproject.org 15 Nov '13

15 Nov '13

commit eb34f2212f7c7fabc5c056a478932ef6cacc76a1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Nov 15 01:29:47 2013 -0800 Bug #10002: Make the update URL point directly at the TBB3.0 blog tag. As good a place as any for now, I guess... --- src/chrome/content/torbutton.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index b5aae62..2137983 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -795,8 +795,8 @@ function torbutton_notify_if_update_needed() { } function torbutton_download_update() { - // XXX: Super super ghetto, but we lack a download page for the alphas right now.. - var downloadURI = "https://archive.torproject.org/tor-package-archive/torbrowser/3.0a4/"; + // XXX: We lack a download page for the alphas right now.. + var downloadURI = "https://blog.torproject.org/category/tags/tbb-30"; var rtSvc = Components.classes["@mozilla.org/xre/app-info;1"] .getService(Components.interfaces.nsIXULRuntime); downloadURI += "?os=" + rtSvc.OS + "&arch=" + rtSvc.XPCOMABI;

1 0

[torbutton/master] Add changelog entry and bump version.
by mikeperry＠torproject.org 15 Nov '13

15 Nov '13

commit 7d13f901c6ec26e5ee3ffe5f05cd533ab30bfc95 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Nov 15 01:34:44 2013 -0800 Add changelog entry and bump version. --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index cb1ceab..fa14d81 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.6.4.1: + 15 Nov 2013 + * Bug 10002: Make the TBB3.0 blog tag our update download url for now. + 1.6.4: 29 Oct 2013 * Bug 9144: Workaround for missing translation properties diff --git a/src/install.rdf b/src/install.rdf index 71c66e3..eed2a47 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.6.4</em:version> + <em:version>1.6.4.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-launcher/master] Update translations and add Japanese locale files.
by mikeperry＠torproject.org 15 Nov '13

15 Nov '13

commit 383030d85795ab73e0fd72ddc24fb754eba968aa Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Nov 15 01:25:37 2013 -0800 Update translations and add Japanese locale files. --- localization/import-translations.sh | 2 +- src/chrome/locale/ja/network-settings.dtd | 55 +++++++++++++++++++++++++++ src/chrome/locale/ja/progress.dtd | 4 ++ src/chrome/locale/ja/torlauncher.properties | 31 +++++++++++++++ src/chrome/locale/pl/network-settings.dtd | 4 +- src/chrome/locale/pl/torlauncher.properties | 2 +- src/chrome/locale/pt/torlauncher.properties | 2 +- 7 files changed, 95 insertions(+), 5 deletions(-) diff --git a/localization/import-translations.sh b/localization/import-translations.sh index a8d07e4..6332ff8 100755 --- a/localization/import-translations.sh +++ b/localization/import-translations.sh @@ -1,6 +1,6 @@ #!/bin/sh -BUNDLE_LOCALES="de es fa fr it ko nl pl pt ru vi zh-CN" +BUNDLE_LOCALES="de es fa fr it ja ko nl pl pt ru vi zh-CN" if [ -d translation ]; then diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd new file mode 100644 index 0000000..c3c4245 --- /dev/null +++ b/src/chrome/locale/ja/network-settings.dtd @@ -0,0 +1,55 @@ +<!ENTITY torsettings.dialog.title "Torネットワーク設定"> + + + +<!ENTITY torsettings.prompt "Tor Browser BundleがTorネットワークへ接続を試みる前に、このコンピュータのインターネット接続についての情報を提供する必要があります。"> + +<!ENTITY torSettings.yes "はい"> +<!ENTITY torSettings.no "いいえ"> + +<!ENTITY torSettings.firstQuestion "以下のうちあなたの状態に最も適しているのはどれですか？"> +<!ENTITY torSettings.configurePrompt1 "このコンピュータのインターネット接続は検閲されているか、フィルターされているか、プロキシを通します。"> +<!ENTITY torSettings.configurePrompt2 "ネットワーク設定を構成する必要があります。"> +<!ENTITY torSettings.configure "構成"> +<!ENTITY torSettings.connectPrompt1 "このコンピュータのインターネット接続には障害がありません。"> +<!ENTITY torSettings.connectPrompt2 "Torネットワークへ直接接続したいです。"> +<!ENTITY torSettings.connect "接続"> + +<!ENTITY torSettings.proxyQuestion "このコンピューターはインターネットにアクセスするのにProxyが必要ですか？"> + +<!ENTITY torSettings.proxyHelp "この質問にどう答えるべきか確信が持てなければ、Proxyの使用がどのように設定されているか確認するために、他のブラウザのインターネット設定を見てください。"> +<!ENTITY torSettings.enterProxy "Proxy設定を入力"> +<!ENTITY torSettings.firewallQuestion "このコンピュータのインターネット接続は特定のポートへの接続のみ許可するファイアーウォールを通しますか？"> +<!ENTITY torSettings.firewallHelp "この質問にどう答えるべきか確信が持てなければ、いいえを選択してください。 Torネットワークへ接続する時に問題に遭遇したなら、この設定を変更してください。"> +<!ENTITY torSettings.enterFirewall "ファイアーウォールによって許可されているポートのコンマ区切りのリストを入力してください。"> +<!ENTITY torSettings.bridgeQuestion "このコンピュータのインターネット接続が検閲されていれば、ブリッジリレーの入手と使用が必要になります。&#160; そうでなければ、接続をクリックするだけで結構です。"> + + + +<!ENTITY torsettings.startingTor "Torの開始を待っています..."> +<!ENTITY torsettings.restart "再起動"> + +<!ENTITY torsettings.optional "オプション"> + +<!ENTITY torsettings.useProxy.checkbox "このコンピューターはインターネットにアクセスするのにProxyを使用する必要があります"> +<!ENTITY torsettings.useProxy.type "Proxyの種類:"> +<!ENTITY torsettings.useProxy.address "アドレス:"> +<!ENTITY torsettings.useProxy.address.placeholder "IPアドレスまたはホストネーム"> +<!ENTITY torsettings.useProxy.port "ポート"> +<!ENTITY torsettings.useProxy.username "ユーザー名:"> +<!ENTITY torsettings.useProxy.password "パスワード:"> +<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> +<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> +<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> +<!ENTITY torsettings.firewall.checkbox "このコンピューターは特定のポートへの接続のみ許可するファイアーウォールを通します。"> +<!ENTITY torsettings.firewall.allowedPorts "許可されたポート:"> +<!ENTITY torsettings.useBridges.checkbox "私のインターネットサービスプロバイダ(ISP)はTorネットワークへの接続をブロックします"> +<!ENTITY torsettings.useBridges.label "1つ以上のブリッジリレーを入力してください(行あたり1つ)。"> +<!ENTITY torsettings.useBridges.placeholder "アドレス:ポートまたはトランスポートアドレス:ポート"> + +<!ENTITY torsettings.copyLog "Torのログをクリップボードにコピー"> +<!ENTITY torsettings.bridgeHelpTitle "ブリッジリレーのヘルプ"> +<!ENTITY torsettings.bridgeHelp1 "Torネットワークに接続できない場合、あなたのインターネットサービスプロバイダ(ISP)か別の代理店がTorをブロックしている可能性があります。&#160; ブロックすることをより困難にする隠しリレーであるTorブリッジを使用することで、しばしばこの問題を回避出来ます。"> +<!ENTITY torsettings.bridgeHelp2 "いくつかブリッジリレーを入手するには、ウェブブラウザーを使用し、以下のページに行ってください: https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3 "パブリックなブリッジアドレスを見つけるもう一つの方法は、本文に<b>get bridges</b>と記入したE-mailを bridges(a)torproject.org 宛に送信することです。&#160; しかし、アタッカーがたくさんのブリッジアドレスを収集するのを困難にするため、あなたは、gmail.comかyahoo.comのドメインのいずれかからこのリクエストを送らなければなりません。"> +<!ENTITY torsettings.bridgeHelp4 "help@rt.torproject.org宛にメールを送信することでもブリッジリレーを要求できます。"> diff --git a/src/chrome/locale/ja/progress.dtd b/src/chrome/locale/ja/progress.dtd new file mode 100644 index 0000000..301fa89 --- /dev/null +++ b/src/chrome/locale/ja/progress.dtd @@ -0,0 +1,4 @@ +<!ENTITY torprogress.dialog.title "Torの状態"> +<!ENTITY torprogress.openSettings "設定を開く"> +<!ENTITY torprogress.heading "Torネットワックに接続しています"> +<!ENTITY torprogress.pleaseWait "Tor BrowserはTorのネットワーク接続が確立された後に開きます。"> diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties new file mode 100644 index 0000000..bd66b3e --- /dev/null +++ b/src/chrome/locale/ja/torlauncher.properties @@ -0,0 +1,31 @@ +### Copyright (c) 2013, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.error_title=Tor Launcher + +torlauncher.tor_exited=Torは予期せず終了しました。 +torlauncher.please_restart_app=このアプリケーションを再起動してください。 +torlauncher.tor_controlconn_failed=Torのコントロールポートに接続出来ませんでした。 +torlauncher.tor_failed_to_start=Torは開始出来ませんでした。 +torlauncher.tor_bootstrap_failed=TorはTorネットワーク接続の確立に失敗しました。 + +torlauncher.unable_to_start_tor=Torを開始出来ません。\n\n%S +torlauncher.tor_missing=Torの実行可能ファイルが見つかりません。 +torlauncher.torrc_missing=torrcファイルが見つかりません。 +torlauncher.datadir_missing=Torのデータディレクトリが存在しません。 +torlauncher.password_hash_missing=ハッシュ化されたパスワードの入手に失敗しました + +torlauncher.failed_to_get_settings=Torの設定を回復出来ません。\n\n%S +torlauncher.failed_to_save_settings=Torの設定を保存出来ません。\n\n%S +torlauncher.ensure_tor_is_running=Torが起動しているかご確認ください。 + +torlauncher.error_proxy_addr_missing=インターネットのアクセスにプロキシを使用するには Tor の構成へ IP アドレスまたはホスト名とポート番号を両方指定する必要があります。 +torlauncher.error_proxy_type_missing=プロキシの種類を選択する必要があります。 +torlauncher.error_bridges_missing=一つ以上のブリッジを記述する必要があります。 + +torlauncher.connect=接続 +torlauncher.quit=終了 +torlauncher.quit_win=終了 +torlauncher.done=完了 + +torlauncher.forAssistance=サポートについては、%Sにお問い合わせください diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index 7a33652..f395b2e 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -44,8 +44,8 @@ <!ENTITY torsettings.firewall.checkbox "Ten komputer pozwala na połączenie z ustalonymi portami"> <!ENTITY torsettings.firewall.allowedPorts "Dozwolone porty:"> <!ENTITY torsettings.useBridges.checkbox "Mój dostawca internetu blokuje połączenia do sieci Tor"> -<!ENTITY torsettings.useBridges.label ""> -<!ENTITY torsettings.useBridges.placeholder ""> +<!ENTITY torsettings.useBridges.label "Dodaj jeden lub więcej przekaźników mostowych (jeden w każdej linijce)"> +<!ENTITY torsettings.useBridges.placeholder "adres:port ALBO transport adres:port"> <!ENTITY torsettings.copyLog "Skopiuj log do schowka"> <!ENTITY torsettings.bridgeHelpTitle "Pomoc Przekaźników Mostkowych"> diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index 3eccc15..301974e 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Tor Launcher torlauncher.tor_exited=Tor wyłączył się niespodziewanie. -# torlauncher.please_restart_app=Please restart this application. +torlauncher.please_restart_app=Proszę zrestartuj tą aplikację. torlauncher.tor_controlconn_failed=Nie można połączyć się z portem kontrolnym Tora. torlauncher.tor_failed_to_start=Nie powiodło się włączenie Tora. torlauncher.tor_bootstrap_failed=Błąd w ustanowieniu połączenia przez Tora.\n\n%S diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index 6a0f13a..c36ee16 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Iniciador Tor torlauncher.tor_exited=O Tor fechou-se insperadamente. -# torlauncher.please_restart_app=Please restart this application. +torlauncher.please_restart_app=Por favor reinicie a aplicação. torlauncher.tor_controlconn_failed=Não foi possível ligar à porta de controlo do Tor. torlauncher.tor_failed_to_start=O Tor falhou a inicialização. torlauncher.tor_bootstrap_failed=o Tor não conseguiu ligar-se à rede Tor.\n\n %S

1 0

[tor-launcher/master] Bump version to 0.2.3.2-rc.
by mikeperry＠torproject.org 15 Nov '13

15 Nov '13

commit 1d2a2b28c06b58c14a7cb72ac84514b732a0ae02 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Nov 15 01:26:49 2013 -0800 Bump version to 0.2.3.2-rc. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index bfde62d..7788ddb 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.3.1-beta</em:version> + <em:version>0.2.3.2-rc</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <!-- <em:optionsURL>chrome://torlauncher/content/preferences.xul</em:optionsURL>

1 0

[flashproxy/master] Remove a Python 2.7 dependency from flashproxy-reg-appspot.
by dcf＠torproject.org 15 Nov '13

15 Nov '13

commit 17eb811465e1755b328d23cf305483e2b27c406b Author: David Fifield <david(a)bamsoftware.com> Date: Thu Nov 14 23:50:06 2013 -0800 Remove a Python 2.7 dependency from flashproxy-reg-appspot. The error was: Failed to get external IP address: PinHTTPSConnection instance has no attribute 'source_address' The documentation for httplib says this member was added in Python 2.7. I discovered the problem while testing the 3.x pluggable transports bundles for Mac OS X. Because of the way M2Crypto is cross-compiled, running the flashproxy client programs requires Python 2.6. Failure to run flashproxy-reg-appspot means that the slower flashproxy-reg-email would be used instead. --- ChangeLog | 2 ++ flashproxy-reg-appspot | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15c61f7..0a96dce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ o Enabled binary frames (avoiding the overhead of base64 encoding) for Firefox 11 and later. Patch by Arlo Breault. Fixes bug 9069. + o Removed a Python 2.7–dependent reference in flashproxy-reg-appspot. + Changes in version 1.4 o Allowed websocket-server to gracefully handle SIGTERM. diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index 87567ba..5522dcf 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -109,7 +109,7 @@ def generate_url(addr): # Like socket.create_connection in that it tries resolving different address # families, but doesn't connect the socket. -def create_socket(address, timeout = None, source_address = None): +def create_socket(address, timeout = None): host, port = address addrs = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM) if not addrs: @@ -120,8 +120,6 @@ def create_socket(address, timeout = None, source_address = None): s = socket.socket(addr[0], addr[1], addr[2]) if timeout is not None and type(timeout) == float: s.settimeout(timeout) - if source_address is not None: - s.bind(source_address) return s except Exception, e: err = e @@ -132,7 +130,7 @@ def create_socket(address, timeout = None, source_address = None): class PinHTTPSConnection(httplib.HTTPSConnection): def connect(self): - sock = create_socket((self.host, self.port), self.timeout, self.source_address) + sock = create_socket((self.host, self.port), self.timeout) if self._tunnel_host: self.sock = sock self._tunnel()

1 0

[tor-browser-bundle/master] Fix argument handling on record-inputs.sh
by mikeperry＠torproject.org 15 Nov '13

15 Nov '13

commit 9989ac8a32247e1a45b193b559fbe98d3a1d5e15 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Nov 14 23:44:59 2013 -0800 Fix argument handling on record-inputs.sh --- gitian/record-inputs.sh | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index 9bc1f7c..4fc79dd 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -1,8 +1,11 @@ #!/bin/bash +WRAPPER_DIR=$(dirname "$0") +WRAPPER_DIR=$(readlink -f "$WRAPPER_DIR") + if [ -z "$1" ]; then - VERSIONS_FILE=./versions + VERSIONS_FILE=$WRAPPER_DIR/versions else VERSIONS_FILE=$1 fi @@ -14,13 +17,7 @@ fi . $VERSIONS_FILE -WRAPPER_DIR=$PWD - -if [ -z "$1" ]; then - INPUTS_DIR=$PWD/../../gitian-builder/inputs -else - INPUTS_DIR=$1 -fi +INPUTS_DIR=$WRAPPER_DIR/../../gitian-builder/inputs cd $INPUTS_DIR

1 0