December 2012 - tor-commits - lists.torproject.org

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 13 Dec '12

13 Dec '12

commit 62c556079c675b0721b0776e2ac95acc5dc68f4b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 13 03:15:15 2012 +0000 Update translations for vidalia --- zh_TW/vidalia_zh_TW.po | 104 ++++++++++++++++++++++++------------------------ 1 files changed, 52 insertions(+), 52 deletions(-) diff --git a/zh_TW/vidalia_zh_TW.po b/zh_TW/vidalia_zh_TW.po index 4c9f54d..8d66c07 100644 --- a/zh_TW/vidalia_zh_TW.po +++ b/zh_TW/vidalia_zh_TW.po @@ -1,4 +1,4 @@ -# +# Translators: # Translators: # <chinrur(a)gmail.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. @@ -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: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-10-02 09:52+0000\n" +"PO-Revision-Date: 2012-12-13 03:14+0000\n" "Last-Translator: chinrur <chinrur(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1066,123 +1066,123 @@ msgstr "蘇里南" msgctxt "CountryInfo" msgid "Swaziland" -msgstr "" +msgstr "史瓦濟蘭" msgctxt "CountryInfo" msgid "Sweden" -msgstr "" +msgstr "瑞典" msgctxt "CountryInfo" msgid "Switzerland" -msgstr "" +msgstr "瑞士" msgctxt "CountryInfo" msgid "Syria" -msgstr "" +msgstr "敘利亞" msgctxt "CountryInfo" msgid "Tajikistan" -msgstr "" +msgstr "塔吉克斯坦" msgctxt "CountryInfo" msgid "Tanzania" -msgstr "" +msgstr "坦桑尼亞" msgctxt "CountryInfo" msgid "Thailand" -msgstr "" +msgstr "泰國" msgctxt "CountryInfo" msgid "Timor-Leste (East Timor)" -msgstr "" +msgstr "東帝汶(東帝文)" msgctxt "CountryInfo" msgid "Togo" -msgstr "" +msgstr "多哥" msgctxt "CountryInfo" msgid "Tonga" -msgstr "" +msgstr "東加" msgctxt "CountryInfo" msgid "Trinidad & Tobago" -msgstr "" +msgstr "千里達及托貝哥" msgctxt "CountryInfo" msgid "Tunisia" -msgstr "" +msgstr "突尼西亞" msgctxt "CountryInfo" msgid "Turkey" -msgstr "" +msgstr "土耳其" msgctxt "CountryInfo" msgid "Turkmenistan" -msgstr "" +msgstr "土庫曼斯坦" msgctxt "CountryInfo" msgid "Tuvalu" -msgstr "" +msgstr "吐瓦魯" msgctxt "CountryInfo" msgid "Uganda" -msgstr "" +msgstr "烏干達" msgctxt "CountryInfo" msgid "Ukraine" -msgstr "" +msgstr "烏克蘭" msgctxt "CountryInfo" msgid "United Arab Emirates" -msgstr "" +msgstr "阿拉伯聯合大公國" msgctxt "CountryInfo" msgid "United Kingdom" -msgstr "" +msgstr "英國" msgctxt "CountryInfo" msgid "United States" -msgstr "" +msgstr "美國" msgctxt "CountryInfo" msgid "Uruguay" -msgstr "" +msgstr "烏拉圭" msgctxt "CountryInfo" msgid "Uzbekistan" -msgstr "" +msgstr "烏茲別克" msgctxt "CountryInfo" msgid "Vanuatu" -msgstr "" +msgstr "萬那杜" msgctxt "CountryInfo" msgid "Vatican" -msgstr "" +msgstr "教廷梵帝岡" msgctxt "CountryInfo" msgid "Venezuela" -msgstr "" +msgstr "委內瑞拉" msgctxt "CountryInfo" msgid "Vietnam" -msgstr "" +msgstr "越南" msgctxt "CountryInfo" msgid "Western Sahara" -msgstr "" +msgstr "西撒哈拉" msgctxt "CountryInfo" msgid "Yemen" -msgstr "" +msgstr "葉門" msgctxt "CountryInfo" msgid "Zambia" -msgstr "" +msgstr "尚比亞" msgctxt "CountryInfo" msgid "Zimbabwe" -msgstr "" +msgstr "辛巴威" msgctxt "CountryInfo" msgid "Zaire" @@ -1190,83 +1190,83 @@ msgstr "" msgctxt "CountryInfo" msgid "Albania" -msgstr "" +msgstr "阿爾巴尼亞" msgctxt "CountryInfo" msgid "Algeria" -msgstr "" +msgstr "阿爾及利亞" msgctxt "CountryInfo" msgid "Austria" -msgstr "" +msgstr "奧地利" msgctxt "CountryInfo" msgid "Bahrain" -msgstr "" +msgstr "巴林" msgctxt "CountryInfo" msgid "Benin" -msgstr "" +msgstr "貝寧" msgctxt "CountryInfo" msgid "Ethiopia" -msgstr "" +msgstr "衣索匹亞" msgctxt "CountryInfo" msgid "Fiji" -msgstr "" +msgstr "斐濟" msgctxt "CountryInfo" msgid "Finland" -msgstr "" +msgstr "芬蘭" msgctxt "CountryInfo" msgid "Greece" -msgstr "" +msgstr "希臘" msgctxt "CountryInfo" msgid "Guam" -msgstr "" +msgstr "關島" msgctxt "CountryInfo" msgid "Hungary" -msgstr "" +msgstr "匈牙利" msgctxt "CountryInfo" msgid "Iceland" -msgstr "" +msgstr "冰島" msgctxt "CountryInfo" msgid "India" -msgstr "" +msgstr "義大利" msgctxt "CountryInfo" msgid "Indonesia" -msgstr "" +msgstr "印度尼西亞" msgctxt "CountryInfo" msgid "Iran" -msgstr "" +msgstr "伊朗" msgctxt "CountryInfo" msgid "Iraq" -msgstr "" +msgstr "伊拉克" msgctxt "CountryInfo" msgid "Ireland" -msgstr "" +msgstr "愛爾蘭" msgctxt "CountryInfo" msgid "Korea, North" -msgstr "" +msgstr "北韓" msgctxt "CountryInfo" msgid "Korea, South" -msgstr "" +msgstr "南韓" msgctxt "CountryInfo" msgid "Libya" -msgstr "" +msgstr "利比亞" msgctxt "CountryInfo" msgid "Maldives"

1 0

[flashproxy/master] Install ChangeLog as a doc file.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit 8e6f23293f2f1d59c982c91f8b74fe0bd47f6ca0 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 13:18:25 2012 -0800 Install ChangeLog as a doc file. --- Makefile | 2 +- doc/bundle-gnulinux.txt | 2 +- doc/bundle-macosx.txt | 2 +- doc/bundle-windows.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 087e23d..7909f23 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ export PYINSTALLER_TMPDIR = pyinstaller-tmp CLIENT_BIN = flashproxy-client flashproxy-reg-email flashproxy-reg-http CLIENT_MAN = doc/flashproxy-client.1 doc/flashproxy-reg-email.1 doc/flashproxy-reg-http.1 -CLIENT_DIST_FILES = $(CLIENT_BIN) README LICENSE torrc +CLIENT_DIST_FILES = $(CLIENT_BIN) README LICENSE ChangeLog torrc CLIENT_DIST_DOC_FILES = $(CLIENT_MAN) doc/LICENSE.GPL doc/LICENSE.PYTHON all: $(CLIENT_DIST_FILES) $(CLIENT_MAN) diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt index e8d8a35..79f5584 100644 --- a/doc/bundle-gnulinux.txt +++ b/doc/bundle-gnulinux.txt @@ -95,7 +95,7 @@ Copy files into the bundle. $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http} App $ cp -r /usr/lib/pymodules/python2.6/M2Crypto App $ mkdir -p Docs/FlashProxy - $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{doc/*,README,LICENSE} Docs/FlashProxy + $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{doc/*,README,LICENSE,ChangeLog} Docs/FlashProxy Make the second half of Data/Tor/torrc look like this (i.e., keep the generic configuration, but change the obfsproxy-specific stuff). diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index 583920f..f9cfd33 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -62,7 +62,7 @@ Copy files into the bundle. $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http} Contents/MacOS $ cp -r ~/bundle/usr/lib/python2.7/site-packages/M2Crypto Contents/MacOS $ mkdir -p Contents/Resources/Docs/FlashProxy - $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{doc/*,README,LICENSE} Contents/Resources/Docs/FlashProxy + $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{doc/*,README,LICENSE,ChangeLog} Contents/Resources/Docs/FlashProxy Make the second half of Library/Vidalia/torrc look like this (i.e., keep the generic configuration, but change the obfsproxy-specific stuff). diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt index 181f2d4..e1d0513 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -35,7 +35,7 @@ from being overwritten. $ cp -n ~/flashproxy/dist/flashproxy-client-VERSION-win32/{*.pyd,*.dll,*.exe,*.manifest} App $ mkdir -p Docs/FlashProxy - $ cp ~/flashproxy/dist/flashproxy-client-VERSION-win32/{doc/*,README,LICENSE} Docs/FlashProxy + $ cp ~/flashproxy/dist/flashproxy-client-VERSION-win32/{doc/*,README,LICENSE,ChangeLog} Docs/FlashProxy Make the second half of Data/Tor/torrc look like this (i.e., keep the generic configuration, but change the obfsproxy-specific stuff).

1 0

[flashproxy/master] Bundle instruction bugs.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit 4b34f60505dd05d94af825bd0f17ac07596232f5 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 13:15:13 2012 -0800 Bundle instruction bugs. --- doc/bundle-gnulinux.txt | 2 +- doc/bundle-macosx.txt | 2 +- doc/bundle-windows.txt | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt index 93bdb30..e8d8a35 100644 --- a/doc/bundle-gnulinux.txt +++ b/doc/bundle-gnulinux.txt @@ -39,7 +39,7 @@ Then boot the VM. You need your normal user to be in the "kvm" group for this to work (sudo usermod -a -G kvm user). $ kvm -hda debian-6-i386-bundle.hda -cdrom debian-6.0.6-i386-netinst.iso - $ kvm -hda debian-6-x86_64-bundle.hda -cdrom debian-6.0.6-i386-netinst.iso + $ kvm -hda debian-6-amd64-bundle.hda -cdrom debian-6.0.6-amd64-netinst.iso Choose "Install" when it boots. Here are settings: diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index fdac6bc..583920f 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -43,7 +43,7 @@ $ python setup.py install --root ~/bundle --prefix=/usr == Browser bundle -Run "make-dist" in the flashproxy source directory. +Run "make dist" in the flashproxy source directory. Download the 32-bit obfsproxy bundle from https://www.torproject.org/projects/obfsproxy. diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt index f64eef7..181f2d4 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -15,6 +15,8 @@ fe4807b4698ec89f82de7d85d32deaa4c772fc871537e31fb0fccf4473455cb8 7z920.msi == Browser bundle +Run "make dist-exe" in the flashproxy source directory. + Download the obfsproxy bundle from https://www.torproject.org/projects/obfsproxy. @@ -31,9 +33,9 @@ Copy files into the bundle. We could remove obfsproxy here but don't. The -n option to cp prevents the existing LIBEAY32.dll and SSLEAY32.dll from being overwritten. - $ cp -n ~/flashproxy/dist/flashproxy-client-0.9-win32/{*.pyd,*.dll,*.exe,*.manifest} App + $ cp -n ~/flashproxy/dist/flashproxy-client-VERSION-win32/{*.pyd,*.dll,*.exe,*.manifest} App $ mkdir -p Docs/FlashProxy - $ cp ~/flashproxy/dist/flashproxy-client-0.9-win32/{doc/*,README,LICENSE} Docs/FlashProxy + $ cp ~/flashproxy/dist/flashproxy-client-VERSION-win32/{doc/*,README,LICENSE} Docs/FlashProxy Make the second half of Data/Tor/torrc look like this (i.e., keep the generic configuration, but change the obfsproxy-specific stuff).

1 0

[flashproxy/master] Copy files from "make dist" in the macosx bundles.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit 46217c459f1dc7da10e3fffa7e0ae5dd97ce4752 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 12:32:01 2012 -0800 Copy files from "make dist" in the macosx bundles. This avoids getting a bunch of documentation files not relevant for clients. --- doc/bundle-macosx.txt | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index 1425df4..8713055 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -43,6 +43,8 @@ $ python setup.py install --root ~/bundle --prefix=/usr == Browser bundle +Run "make-dist" in the flashproxy source directory. + Download the 32-bit obfsproxy bundle from https://www.torproject.org/projects/obfsproxy. @@ -57,10 +59,10 @@ Extract the bundle. Copy files into the bundle. - $ cp ~/flashproxy/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http} Contents/MacOS + $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http} Contents/MacOS $ cp -r ~/bundle/usr/lib/python2.7/site-packages/M2Crypto Contents/MacOS $ mkdir -p Contents/Resources/Docs/FlashProxy - $ cp ~/flashproxy/{doc/*,README,LICENSE} Contents/Resources/Docs/FlashProxy + $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{doc/*,README,LICENSE} Contents/Resources/Docs/FlashProxy Make the second half of Data/Tor/torrc look like this (i.e., keep the generic configuration, but change the obfsproxy-specific stuff).

1 0

[flashproxy/master] Don't let unlinked proxies drop to 0 before asking for more.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit e156a88d17766dfe90bb30a3cbc0ad2667c2474a Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 12:56:23 2012 -0800 Don't let unlinked proxies drop to 0 before asking for more. We want to avoid stalling when the last proxy drops off. --- flashproxy-client | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index 3ce327e..0c58754 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -38,6 +38,10 @@ DEFAULT_LOCAL_PORT_EXTERNAL = 9001 DEFAULT_REMOTE_PORT = 9000 DEFAULT_REGISTER_METHODS = ["email", "http"] +# We will re-register if we have fewer than this many waiting proxies. The +# facilitator may choose to ignore our requests. +DESIRED_NUMBER_OF_PROXIES = 3 + LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" class options(object): @@ -720,7 +724,7 @@ def registration_thread_func(): register_condvar.acquire() register_condvar.wait() register_condvar.release() - if not unlinked_remotes: + if len(unlinked_remotes) < DESIRED_NUMBER_OF_PROXIES: register_one() def proxy_chunk_local_to_remote(local, remote, data = None):

1 0

[flashproxy/master] Fix a couple more bugs in the OS X bundle instructions.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit f267b70d30d40ddd85a86b353a3681824448c276 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 12:44:24 2012 -0800 Fix a couple more bugs in the OS X bundle instructions. --- doc/bundle-macosx.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index 8713055..fdac6bc 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -54,7 +54,7 @@ https://www.torproject.org/dist/torbrowser/osx/TorBrowser-Obfsproxy-2.4.6-a… Extract the bundle. $ gpg --verify TorBrowser-Obfsproxy-2.4.6-alpha-2-osx-i386-en-US.zip.asc - $ tar xzvf TorBrowser-Obfsproxy-2.4.6-alpha-2-osx-i386-en-US.zip + $ unzip TorBrowser-Obfsproxy-2.4.6-alpha-2-osx-i386-en-US.zip $ cd TorBrowser_en-US.app Copy files into the bundle. @@ -64,7 +64,7 @@ Copy files into the bundle. $ mkdir -p Contents/Resources/Docs/FlashProxy $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{doc/*,README,LICENSE} Contents/Resources/Docs/FlashProxy -Make the second half of Data/Tor/torrc look like this (i.e., keep +Make the second half of Library/Vidalia/torrc look like this (i.e., keep the generic configuration, but change the obfsproxy-specific stuff). Basically you are concatenating the normal flashproxy-client torrc, but changing "./flashproxy-client" to "flashproxy-client".

1 0

[flashproxy/master] Increase version to 0.10.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit 099177419248c70d7f0ecf8a6fb50ae67b9051b0 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 12:46:39 2012 -0800 Increase version to 0.10. There's nothing too special in this version, but I want the alpha bundles to contain an actual released version of the software. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 52eb40a..087e23d 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION = 0.9 +VERSION = 0.10 PREFIX = /usr/local BINDIR = $(PREFIX)/bin

1 0

[flashproxy/master] ChangeLog for 0.10.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit bb7dcdea1e1a04ed8f25cfbc101fbc4f3cdf289b Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 13:01:06 2012 -0800 ChangeLog for 0.10. --- ChangeLog | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ad2f00..e81a750 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Changes in version 0.10 + o Fixed a bug in flashproxy-client that made it susceptible to a + denial of service (program crash) when receiving large WebSocket + messages made up of many small fragmented frames. + + o Made the facilitator hand out more proxies by default, reducing a + client's need to re-register. + Changes in version 0.9 o There are executable Windows packages of the client programs, so that the programs can be run without Python being installed. Fixes

1 0

r25939: {website} update the contact to highlight help@rt. (website/trunk/about/en)
by Andrew Lewman 12 Dec '12

12 Dec '12

Author: phobos Date: 2012-12-12 21:06:06 +0000 (Wed, 12 Dec 2012) New Revision: 25939 Modified: website/trunk/about/en/contact.wml Log: update the contact to highlight help@rt. Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2012-12-11 21:32:10 UTC (rev 25938) +++ website/trunk/about/en/contact.wml 2012-12-12 21:06:06 UTC (rev 25939) @@ -27,12 +27,14 @@ help(a)rt.torproject.org is the address to use for Tor support requests. This is staffed for helping people with questions about - all things Tor. This is best effort service with no guarantees. + all things Tor. This is best effort service with no guarantees. We + generally respond within 24 hours. <a id="email"></a> <h3><a class="anchor" href="#email">Email</a></h3> tor-assistants(a)torproject.org is the catch-all address for - everything. It can be used for reaching people working on Tor. + everything else. It can be used for reaching people working on Tor. + Please email <ew>help(a)rt.torproject.org for support or help questions. A few other addresses are more specific: @@ -41,8 +43,6 @@ href="<page getinvolved/translation>">website translations</a> into place, and help answer questions about existing and new translations.</li> - <li>tordnsel at torproject.org is the alias for the people responsible for - the tordns exitlist.</li> <li>donations(a)torproject.org is for questions and comments about <a href="<page donate/donate>">getting money to the developers</a>. More donations means <a href="<page docs/faq>#Funding">more @@ -83,8 +83,6 @@ us at torproject(a)jit.si for live help, questions, or feedback. This address does not receive emails, only XMPP and VOIP. - The best time to reach someone is 10:00 - 12:00 GMT-5 - on Tuesday and 16:00 - 18:00 GMT-5 on Thursday. Our OTR fingerprint is F624A3 158D22 19F48E E28A73 09F527 1AD5DF 668D. Learn more about <a href="http://www.cypherpunks.ca/otr/">Off-the-Record</a> @@ -103,7 +101,7 @@ will reach the Tor office. Should there be no answer, please leave a message with a way to reach you. Please be aware that your phone company and ours (and everyone in between) could listen to the - call. Please email help(a)rt.torproject.org for support. + call. Please email help(a)rt.torproject.org for support. </div>

1 0

[flashproxy/master] Break out the Window bundle instructions to a separate file.
by dcf＠torproject.org 12 Dec '12

12 Dec '12

commit a47a7bb22b62cda5b662dfd09da0eaedfec6d7a6 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 12 12:26:02 2012 -0800 Break out the Window bundle instructions to a separate file. --- doc/bundle-windows.txt | 63 ++++++++++++++++++++++++++++++++++++++ doc/windows-deployment-howto.txt | 62 ------------------------------------- 2 files changed, 63 insertions(+), 62 deletions(-) diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt new file mode 100644 index 0000000..f64eef7 --- /dev/null +++ b/doc/bundle-windows.txt @@ -0,0 +1,63 @@ +== Dependencies + +=== 7-Zip + +This is used to build a self-extracting bundle executable. The p7zip +package from Cywin doesn't work because the self-extracting executables +it produces requrie cygwin1.dll. + +http://7-zip.org/download.html +http://downloads.sourceforge.net/project/sevenzip/7-Zip/9.20/7z920.msi + +The sha256sum of the package I used was + +fe4807b4698ec89f82de7d85d32deaa4c772fc871537e31fb0fccf4473455cb8 7z920.msi + +== Browser bundle + +Download the obfsproxy bundle from +https://www.torproject.org/projects/obfsproxy. + +https://www.torproject.org/dist/torbrowser/tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe +https://www.torproject.org/dist/torbrowser/tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe.asc + +Extract the bundle. + + $ gpg --verify tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe.asc + $ "/cygdrive/c/Program Files (x86)/7-Zip/7z" x tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe + $ cd "Tor Browser" + +Copy files into the bundle. We could remove obfsproxy here but don't. +The -n option to cp prevents the existing LIBEAY32.dll and SSLEAY32.dll +from being overwritten. + + $ cp -n ~/flashproxy/dist/flashproxy-client-0.9-win32/{*.pyd,*.dll,*.exe,*.manifest} App + $ mkdir -p Docs/FlashProxy + $ cp ~/flashproxy/dist/flashproxy-client-0.9-win32/{doc/*,README,LICENSE} Docs/FlashProxy + +Make the second half of Data/Tor/torrc look like this (i.e., keep +the generic configuration, but change the obfsproxy-specific stuff). +Basically you are concatenating the normal flashproxy-client torrc, but +changing "./flashproxy-client" to "flashproxy-client". + +UseBridges 1 +# The address and port are ignored by the client transport plugin. +Bridge websocket 0.0.1.0:1 +LearnCircuitBuildTimeout 0 +CircuitBuildTimeout 60 +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 + +Re-zip the bundle. The "alpha" number should be independent of the +obfsproxy bundle's alpha. + + $ cd .. + $ "/cygdrive/c/Program Files (x86)/7-Zip/7z" a -sfx tor-flashproxy-browser-2.4.6-alpha-1_en-US.exe "Tor Browser" + +Test running the bundle. Extract into a separate directory, double-click +the icon and "Start Tor Browser.exe". + + $ mkdir tmp + $ cp tor-flashproxy-browser-2.4.6-alpha-1_en-US.exe tmp diff --git a/doc/windows-deployment-howto.txt b/doc/windows-deployment-howto.txt index f3f8852..2514a1a 100644 --- a/doc/windows-deployment-howto.txt +++ b/doc/windows-deployment-howto.txt @@ -132,65 +132,3 @@ Build the package. $ python setup.py bdist_wininst This will leave an MSI installer in the dist directory. Double-click it to install M2Crypto amid the other Python files. - -=== 7-Zip - -This is used to build a self-extracting bundle executable. The p7zip -package from Cywin doesn't work because the self-extracting executables -it produces requrie cygwin1.dll. - -http://7-zip.org/download.html -http://downloads.sourceforge.net/project/sevenzip/7-Zip/9.20/7z920.msi - -The sha256sum of the package I used was - -fe4807b4698ec89f82de7d85d32deaa4c772fc871537e31fb0fccf4473455cb8 7z920.msi - -== Browser bundle - -Download the obfsproxy bundle from -https://www.torproject.org/projects/obfsproxy. - -https://www.torproject.org/dist/torbrowser/tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe -https://www.torproject.org/dist/torbrowser/tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe.asc - -Extract the bundle. - - $ gpg --verify tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe.asc - $ "/cygdrive/c/Program Files (x86)/7-Zip/7z" x tor-obfsproxy-browser-2.4.6-alpha-2_en-US.exe - $ cd "Tor Browser" - -Copy files into the bundle. We could remove obfsproxy here but don't. -The -n option to cp prevents the existing LIBEAY32.dll and SSLEAY32.dll -from being overwritten. - - $ cp -n ~/flashproxy/dist/flashproxy-client-0.9-win32/{*.pyd,*.dll,*.exe,*.manifest} App - $ mkdir -p Docs/FlashProxy - $ cp ~/flashproxy/dist/flashproxy-client-0.9-win32/{doc/*,README,LICENSE} Docs/FlashProxy - -Make the second half of Data/Tor/torrc look like this (i.e., keep -the generic configuration, but change the obfsproxy-specific stuff). -Basically you are concatenating the normal flashproxy-client torrc, but -changing "./flashproxy-client" to "flashproxy-client". - -UseBridges 1 -# The address and port are ignored by the client transport plugin. -Bridge websocket 0.0.1.0:1 -LearnCircuitBuildTimeout 0 -CircuitBuildTimeout 60 -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 - -Re-zip the bundle. The "alpha" number should be independent of the -obfsproxy bundle's alpha. - - $ cd .. - $ "/cygdrive/c/Program Files (x86)/7-Zip/7z" a -sfx tor-flashproxy-browser-2.4.6-alpha-1_en-US.exe "Tor Browser" - -Test running the bundle. Extract into a separate directory, double-click -the icon and "Start Tor Browser.exe". - - $ mkdir tmp - $ cp tor-flashproxy-browser-2.4.6-alpha-1_en-US.exe tmp

1 0