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

[translation/tsum] Update translations for tsum
by translation＠torproject.org 07 Apr '13

07 Apr '13

commit e3ea5bafcc6dbed3a104e8b8c01bee4aef55070c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 7 06:45:15 2013 +0000 Update translations for tsum --- zh_CN/short-user-manual_zh_CN_noimg.xhtml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_CN/short-user-manual_zh_CN_noimg.xhtml b/zh_CN/short-user-manual_zh_CN_noimg.xhtml index c30fba7..a67cdff 100644 --- a/zh_CN/short-user-manual_zh_CN_noimg.xhtml +++ b/zh_CN/short-user-manual_zh_CN_noimg.xhtml @@ -8,9 +8,9 @@ 本用户手册所含内容：如何下载与使用 Tor，以及 Tor 无法连接到网络时该怎么办。如果本手册未提供你所需的答案，请发送电子邮件至 help-zh(a)rt.torproject.xn--org()-8n1h080l. 请注意：由于每天收到大量的电子邮件，而我们提供的支持服务是志愿性的，因此，如未能及时回复，请勿着急。 <h2 id="how-tor-works">Tor 是如何工作的</h2> - Tor 是一个由虚拟通道组成的网络，用于提高用户的互联网安全和隐私。在你的网络流量被发送至公共互联网之前，Tor 会先把它们经由 Tor 网络中的三台随机服务器（也称为“中继”）传送。 - 上图描绘了一个用户通过 Tor 浏览不同的网站。绿色的显示器代表着 Tor 网络里的中继服务器，三把钥匙则代表该用户与每个中继之间的加密层。 - Tor 会把你的流量来源匿名化，并且把介于你和 Tor 网络中传送的所有内容加密。Tor 也会把你在 Tor 网络内部的流量加密，但不能加密 Tor 网络与最终目的地之间的流量。 + Tor 是一个由虚拟通道组成的网络，用于提高用户的互联网安全和隐私。用户的网络数据发送到公用的互联网之前，Tor 将通过三台随机的服务器（也称为“中继”）来传输这些数据。 + 上图展示了用户如何通过 Tor 网络来浏览不同的网站。绿色显示器表示 Tor 网络中的中继服务器；三把钥匙表示用户与每个中继之间的加密层。 + Tor 将隐去用户网络通信的来源，并将对用户与 Tor 网络之间的所有数据进行加密。另外，Tor 对于 Tor 网络内部的用户通信也将进行加密，但对于 Tor 网络与最终目的站点之间的通信，Tor 并未进行加密。 如果你是在交流敏感信息，例如以用户名和密码登录一个网站，请确保你在使用 HTTPS （如 https://torproject.org/，而不是 http://torproject.org/）。 <h2 id="how-to-download-tor">如何下载 Tor</h2> 我们向大多数用户推荐 <a href="https://www.torproject.org/projects/torbrowser.html">Tor 浏览器软件包</a>。此软件包内含一个预先配置好的浏览器，用于透过 Tor 安全的浏览互联网，且无需安装。你只需下载软件包，解压缩，并运行 Tor。

1 0

r26146: {website} better long-term link for flashproxy (website/trunk/docs/en)
by Roger Dingledine 07 Apr '13

07 Apr '13

Author: arma Date: 2013-04-07 05:47:05 +0000 (Sun, 07 Apr 2013) New Revision: 26146 Modified: website/trunk/docs/en/pluggable-transports.wml Log: better long-term link for flashproxy Modified: website/trunk/docs/en/pluggable-transports.wml =================================================================== --- website/trunk/docs/en/pluggable-transports.wml 2013-04-05 04:35:47 UTC (rev 26145) +++ website/trunk/docs/en/pluggable-transports.wml 2013-04-07 05:47:05 UTC (rev 26146) @@ -58,7 +58,7 @@ Maintained by David Fifield. # <iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="80" height="15" frameborder="0" scrolling="no"></iframe> - Status: <a href="https://blog.torproject.org/blog/combined-flash-proxy-pyobfsproxy-browser-b…">Deployed</a> + Status: <a href="https://crypto.stanford.edu/flashproxy/#how-to">Deployed</a> </li> <li>StegoTorus is an Obfsproxy fork that extends it to a)

1 0

[translation/tsum_completed] Update translations for tsum_completed
by translation＠torproject.org 07 Apr '13

07 Apr '13

commit 78e4e10588bcdb7a9a357a42ae8098ce5b24d42d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 7 05:45:19 2013 +0000 Update translations for tsum_completed --- zh_CN/short-user-manual_zh_CN_noimg.xhtml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zh_CN/short-user-manual_zh_CN_noimg.xhtml b/zh_CN/short-user-manual_zh_CN_noimg.xhtml index 61da930..c30fba7 100644 --- a/zh_CN/short-user-manual_zh_CN_noimg.xhtml +++ b/zh_CN/short-user-manual_zh_CN_noimg.xhtml @@ -8,7 +8,7 @@ 本用户手册所含内容：如何下载与使用 Tor，以及 Tor 无法连接到网络时该怎么办。如果本手册未提供你所需的答案，请发送电子邮件至 help-zh(a)rt.torproject.xn--org()-8n1h080l. 请注意：由于每天收到大量的电子邮件，而我们提供的支持服务是志愿性的，因此，如未能及时回复，请勿着急。 <h2 id="how-tor-works">Tor 是如何工作的</h2> - Tor 是一个由虚拟通道组成的网络，用于提供用户的互联网安全和隐私。在你的网络流量被发送至公共互联网之前，Tor 会先把它们经由 Tor 网络中的三台随机服务器（也称为“中继”）传送。 + Tor 是一个由虚拟通道组成的网络，用于提高用户的互联网安全和隐私。在你的网络流量被发送至公共互联网之前，Tor 会先把它们经由 Tor 网络中的三台随机服务器（也称为“中继”）传送。 上图描绘了一个用户通过 Tor 浏览不同的网站。绿色的显示器代表着 Tor 网络里的中继服务器，三把钥匙则代表该用户与每个中继之间的加密层。 Tor 会把你的流量来源匿名化，并且把介于你和 Tor 网络中传送的所有内容加密。Tor 也会把你在 Tor 网络内部的流量加密，但不能加密 Tor 网络与最终目的地之间的流量。 如果你是在交流敏感信息，例如以用户名和密码登录一个网站，请确保你在使用 HTTPS （如 https://torproject.org/，而不是 http://torproject.org/）。

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 07 Apr '13

07 Apr '13

commit 43fbeabf4f648d1c375e321e3897109a31da5e9b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 7 05:45:15 2013 +0000 Update translations for tsum --- zh_CN/short-user-manual_zh_CN_noimg.xhtml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zh_CN/short-user-manual_zh_CN_noimg.xhtml b/zh_CN/short-user-manual_zh_CN_noimg.xhtml index 61da930..c30fba7 100644 --- a/zh_CN/short-user-manual_zh_CN_noimg.xhtml +++ b/zh_CN/short-user-manual_zh_CN_noimg.xhtml @@ -8,7 +8,7 @@ 本用户手册所含内容：如何下载与使用 Tor，以及 Tor 无法连接到网络时该怎么办。如果本手册未提供你所需的答案，请发送电子邮件至 help-zh(a)rt.torproject.xn--org()-8n1h080l. 请注意：由于每天收到大量的电子邮件，而我们提供的支持服务是志愿性的，因此，如未能及时回复，请勿着急。 <h2 id="how-tor-works">Tor 是如何工作的</h2> - Tor 是一个由虚拟通道组成的网络，用于提供用户的互联网安全和隐私。在你的网络流量被发送至公共互联网之前，Tor 会先把它们经由 Tor 网络中的三台随机服务器（也称为“中继”）传送。 + Tor 是一个由虚拟通道组成的网络，用于提高用户的互联网安全和隐私。在你的网络流量被发送至公共互联网之前，Tor 会先把它们经由 Tor 网络中的三台随机服务器（也称为“中继”）传送。 上图描绘了一个用户通过 Tor 浏览不同的网站。绿色的显示器代表着 Tor 网络里的中继服务器，三把钥匙则代表该用户与每个中继之间的加密层。 Tor 会把你的流量来源匿名化，并且把介于你和 Tor 网络中传送的所有内容加密。Tor 也会把你在 Tor 网络内部的流量加密，但不能加密 Tor 网络与最终目的地之间的流量。 如果你是在交流敏感信息，例如以用户名和密码登录一个网站，请确保你在使用 HTTPS （如 https://torproject.org/，而不是 http://torproject.org/）。

1 0

[stem/master] Favicon for our site
by atagar＠torproject.org 07 Apr '13

07 Apr '13

commit b7d8cadd12ff630bfe204e3f575bd624e9fae224 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 6 22:14:45 2013 -0700 Favicon for our site Mmmm, 32x32 favicon. I tried to get an ico as the sphinx config suggests but that didn't work. Oh well, just about every browser except maybe IE can handle pngs so I'd prefer to go with that anyway. --- docs/_static/favicon.png | Bin 0 -> 996 bytes docs/conf.py | 3 ++- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/docs/_static/favicon.png b/docs/_static/favicon.png new file mode 100644 index 0000000..4b04b4b Binary files /dev/null and b/docs/_static/favicon.png differ diff --git a/docs/conf.py b/docs/conf.py index 71b89b5..0bce09f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -123,7 +123,8 @@ html_logo = 'logo.png' # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 # pixels large. -#html_favicon = None + +html_favicon = 'favicon.png' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files,

1 0

[flashproxy/master] Use bundle-torrc-gnulinux in the current directory.
by dcf＠torproject.org 07 Apr '13

07 Apr '13

commit 814a9e58ee9e9031cdcf0b3ec6845e9c60bc11a8 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 6 19:00:11 2013 -0700 Use bundle-torrc-gnulinux in the current directory. This conceptually belongs to the same directory as Makefile, which only happens to currently be in the flashproxy repository. These bundle files should be moved somewhere else and these files should go together. --- doc/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 9ebd485..06cc9e7 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -61,7 +61,7 @@ $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): cp "$(PYOBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Docs/PyObfsproxy find "$(TBBDIR)"/App -name '*.pyc' | xargs rm -f - cat "$(FLASHPROXY_HOME)"/doc/bundle-torrc-gnulinux >> "$(TBBDIR)"/Data/Tor/torrc + cat bundle-torrc-gnulinux >> "$(TBBDIR)"/Data/Tor/torrc tar czf "$@" -C "$(WORKDIR)" tor-browser_en-US

1 0

[flashproxy/master] Add bundle support for macosx-i686.
by dcf＠torproject.org 07 Apr '13

07 Apr '13

commit c23caf1f71f8281319cadf55002723dbcd333905 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 6 21:41:01 2013 -0700 Add bundle support for macosx-i686. --- doc/Makefile | 37 +++++++++++++++++++++++++++++++++++- doc/bundle-macosx.txt | 50 ++++++++++-------------------------------------- 2 files changed, 47 insertions(+), 40 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 9defe64..e0ae409 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -9,6 +9,7 @@ FLASHPROXY_DIST_WIN32 = $(FLASHPROXY_HOME)/dist/flashproxy-client-$(FLASHPROXY_V PYOBFSPROXY_HOME = $(HOME)/pyobfsproxy PYOBFSPROXY_DIST = $(PYOBFSPROXY_HOME) PYOBFSPROXY_DIST_WIN32 = $(PYOBFSPROXY_HOME)/py2exe_bundle/dist +MACOSX_BUNDLE_ROOT = $(HOME)/bundle P7Z = /cygdrive/c/Program Files (x86)/7-Zip/7z P7ZG = /cygdrive/c/Program Files (x86)/7-Zip/7zg @@ -22,16 +23,19 @@ BUNDLE_VERSION_STRING = $(BUNDLE_VERSION)-$(BUNDLE_RELEASE) PT_BUNDLE_VERSION_STRING = $(BUNDLE_VERSION)-$(BUNDLE_RELEASE)-$(PT_BUNDLE_RELEASE) BUNDLE_WINDOWS = tor-browser-$(BUNDLE_VERSION_STRING)_en-US.exe +BUNDLE_MACOSX_I686 = TorBrowser-$(BUNDLE_VERSION_STRING)-osx-i386-en-US.zip BUNDLE_GNULINUX_I686 = tor-browser-gnu-linux-i686-$(BUNDLE_VERSION_STRING)-dev-en-US.tar.gz BUNDLE_GNULINUX_X86_64 = tor-browser-gnu-linux-x86_64-$(BUNDLE_VERSION_STRING)-dev-en-US.tar.gz PT_BUNDLE_WINDOWS = tor-pluggable-transports-browser-$(PT_BUNDLE_VERSION_STRING)_en-US.exe +PT_BUNDLE_MACOSX_I686 = TorBrowser-Pluggable-Transports-$(BUNDLE_VERSION_STRING)-osx-i386-en-US.zip PT_BUNDLE_GNULINUX_I686 = tor-pluggable-transports-browser-gnu-linux-i686-$(PT_BUNDLE_VERSION_STRING)-dev-en-US.tar.gz PT_BUNDLE_GNULINUX_X86_64 = tor-pluggable-transports-browser-gnu-linux-x86_64-$(PT_BUNDLE_VERSION_STRING)-dev-en-US.tar.gz all: @echo "Try one of these:" @echo $$'\tmake windows' + @echo $$'\tmake macosx-i686' @echo $$'\tmake gnulinux-i686' @echo $$'\tmake gnulinux-x86_64' @echo @@ -43,11 +47,14 @@ all: @echo $$'\t"python setup_py2exe.py py2exe" in the pyobfsproxy directory' windows: $(PT_BUNDLE_WINDOWS) +macosx-i686: $(PT_BUNDLE_MACOSX_I686) gnulinux-i686: $(PT_BUNDLE_GNULINUX_I686) gnulinux-x86_64: $(PT_BUNDLE_GNULINUX_X86_64) $(PT_BUNDLE_WINDOWS): WORKDIR = work/windows-$(PT_BUNDLE_VERSION_STRING) +$(PT_BUNDLE_MACOSX_I686): WORKDIR = work/macosx-$(PT_BUNDLE_VERSION_STRING) + $(PT_BUNDLE_GNULINUX_I686): WORKDIR = work/gnulinux-i686-$(PT_BUNDLE_VERSION_STRING) $(PT_BUNDLE_GNULINUX_I686): BUNDLE_GNULINUX = $(BUNDLE_GNULINUX_I686) @@ -76,6 +83,31 @@ $(PT_BUNDLE_WINDOWS): cd "$(WORKDIR)" && "$(P7ZG)" a -sfx "$@" "Tor Browser" mv "$(WORKDIR)/$@" . +$(PT_BUNDLE_MACOSX_I686): TBBDIR = $(WORKDIR)/TorBrowser_en-US.app +$(PT_BUNDLE_MACOSX_I686): + # Download and check signature. + $(MAKE) checksig-$(BUNDLE_MACOSX_I686) + + rm -rf "$(WORKDIR)" + mkdir -p "$(WORKDIR)" + unzip "$(BUNDLE_MACOSX_I686)" -d "$(WORKDIR)" + + cp "$(FLASHPROXY_DIST)"/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} "$(TBBDIR)"/Contents/MacOS + cp -r "$(MACOSX_BUNDLE_ROOT)"/usr/lib/python2.7/site-packages/M2Crypto "$(TBBDIR)"/Contents/MacOS + mkdir -p "$(TBBDIR)"/Contents/Resources/Docs/FlashProxy + cp "$(FLASHPROXY_DIST)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Contents/Resources/Docs/FlashProxy + cp -r "$(PYOBFSPROXY_DIST)"/{obfsproxy,bin/pyobfsproxy} "$(TBBDIR)"/Contents/MacOs + cp -r "$(MACOSX_BUNDLE_ROOT)"/usr/lib/python2.7/site-packages/{Crypto,pyptlib} "$(TBBDIR)"/Contents/MacOS + cp "$(MACOSX_BUNDLE_ROOT)"/argparse-1.2.1/argparse.py "$(TBBDIR)"/Contents/MacOS + mkdir -p "$(TBBDIR)"/Contents/Resources/Docs/PyObfsproxy + cp "$(PYOBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Contents/Resources/Docs/PyObfsproxy + find "$(TBBDIR)"/Contents/MacOS -name '*.pyc' | xargs rm -f + + cat bundle-torrc-macosx >> "$(TBBDIR)"/Library/Vidalia/torrc + + cd "$(WORKDIR)" && zip -r -9 "$@" TorBrowser_en-US.app/ + mv "$(WORKDIR)/$@" . + # Shared GNU/Linux 32-bit and 64-bit target. $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): TBBDIR = $(WORKDIR)/tor-browser_en-US $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): @@ -106,6 +138,9 @@ $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): $(BUNDLE_WINDOWS) $(BUNDLE_WINDOWS).asc: rm -f "$@" wget --no-clobber "$(BUNDLE_DIST_URL)/$@" +$(BUNDLE_MACOSX_I686) $(BUNDLE_MACOSX_I686).asc: + rm -f "$@" + curl -O "$(BUNDLE_DIST_URL)/osx/$@" $(BUNDLE_GNULINUX_I686) $(BUNDLE_GNULINUX_I686).asc \ $(BUNDLE_GNULINUX_X86_64) $(BUNDLE_GNULINUX_X86_64).asc: rm -f "$@" @@ -116,4 +151,4 @@ checksig-%: % %.asc # Need Bash for certain wildcards. SHELL = /bin/bash -.PHONY: checksig-% windows gnulinux-i686 gnulinux-x86_64 +.PHONY: checksig-% windows macosx-i686 gnulinux-i686 gnulinux-x86_64 diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index dc3118e..0830511 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -81,45 +81,17 @@ Clone pyobfsproxy. $ git clone https://git.torproject.org/pluggable-transports/pyobfsproxy.git -Download the 32-bit browser bundle from +Enter the doc directory and edit the top of Makefile to set the version +numbers you want to use. + BUNDLE_VERSION = ... + BUNDLE_RELEASE = ... + PT_BUNDLE_RELEASE = pt1 +The latest Tor Browser Bundle version number can be found at https://www.torproject.org/projects/torbrowser.html.en#Download-torbrowserb…. +PT_BUNDLE_RELEASE release should increment each time you build a new +bundle with the same BUNDLE_VERSION and BUNDLE_RELEASE, and be reset to +"pt1" when either of those change. -https://www.torproject.org/dist/torbrowser/osx/TorBrowser-2.4.11-alpha-1-osx-i386-en-US.zip -https://www.torproject.org/dist/torbrowser/osx/TorBrowser-2.4.11-alpha-1-osx-i386-en-US.zip.asc + $ make macosx-i686 -Extract the bundle. - - $ gpg --verify TorBrowser-2.4.11-alpha-1-osx-i386-en-US.zip.asc - $ rm -r TorBrowser_en-US.app - $ unzip TorBrowser-2.4.11-alpha-1-osx-i386-en-US.zip - -Copy files into the bundle. - - $ cd TorBrowser_en-US.app - $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} 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,ChangeLog} Contents/Resources/Docs/FlashProxy - $ cp -r ~/pyobfsproxy/{obfsproxy,bin/pyobfsproxy} Contents/MacOs - $ cp -r ~/bundle/usr/lib/python2.7/site-packages/{Crypto,pyptlib} Contents/MacOS - $ cp ~/bundle/argparse-1.2.1/argparse.py Contents/MacOS - $ mkdir -p Contents/Resources/Docs/PyObfsproxy - $ cp ~/pyobfsproxy/{LICENSE,README} Contents/Resources/Docs/PyObfsproxy - $ find Contents/MacOS -name '*.pyc' | xargs rm -f - -Append bundle-torrc-macosx to the end of Library/Vidalia/torrc. - - $ cat ~/flashproxy/doc/bundle-torrc-macosx >> Library/Vidalia/torrc - -Re-zip the bundle. The "alpha" number should be independent of the -browser bundle's alpha. - - $ cd .. - $ rm -f TorBrowser-Pluggable-Transports-2.4.11-alpha-1-osx-i386-en-US.zip - $ zip -r -9 TorBrowser-Pluggable-Transports-2.4.11-alpha-1-osx-i386-en-US.zip TorBrowser_en-US.app/ - -Test running the bundle. Extract into a separate directory, double-click -the icon to unzip, and run TorBrowser_en-US.app. - - $ mkdir tmp - $ cp TorBrowser-Pluggable-Transports-2.4.11-alpha-1-osx-i386-en-US.zip tmp +Test running the bundle.

1 0

[flashproxy/master] Add bundle support for windows.
by dcf＠torproject.org 07 Apr '13

07 Apr '13

commit ba805fd2ff6860a9853ff5329ac527dd6a48f881 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 6 19:32:51 2013 -0700 Add bundle support for windows. --- doc/Makefile | 44 ++++++++++++++++++++++++++++++++++++++++++-- doc/bundle-windows.txt | 44 ++++++++++---------------------------------- 2 files changed, 52 insertions(+), 36 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 06cc9e7..9defe64 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -5,8 +5,13 @@ PT_BUNDLE_RELEASE = pt1 FLASHPROXY_HOME = $(HOME)/flashproxy FLASHPROXY_VERSION = 1.0 FLASHPROXY_DIST = $(FLASHPROXY_HOME)/dist/flashproxy-client-$(FLASHPROXY_VERSION) +FLASHPROXY_DIST_WIN32 = $(FLASHPROXY_HOME)/dist/flashproxy-client-$(FLASHPROXY_VERSION)-win32 PYOBFSPROXY_HOME = $(HOME)/pyobfsproxy PYOBFSPROXY_DIST = $(PYOBFSPROXY_HOME) +PYOBFSPROXY_DIST_WIN32 = $(PYOBFSPROXY_HOME)/py2exe_bundle/dist + +P7Z = /cygdrive/c/Program Files (x86)/7-Zip/7z +P7ZG = /cygdrive/c/Program Files (x86)/7-Zip/7zg DOWNLOADDIR = download WORKDIR = work @@ -16,29 +21,61 @@ BUNDLE_DIST_URL = https://www.torproject.org/dist/torbrowser BUNDLE_VERSION_STRING = $(BUNDLE_VERSION)-$(BUNDLE_RELEASE) PT_BUNDLE_VERSION_STRING = $(BUNDLE_VERSION)-$(BUNDLE_RELEASE)-$(PT_BUNDLE_RELEASE) +BUNDLE_WINDOWS = tor-browser-$(BUNDLE_VERSION_STRING)_en-US.exe BUNDLE_GNULINUX_I686 = tor-browser-gnu-linux-i686-$(BUNDLE_VERSION_STRING)-dev-en-US.tar.gz BUNDLE_GNULINUX_X86_64 = tor-browser-gnu-linux-x86_64-$(BUNDLE_VERSION_STRING)-dev-en-US.tar.gz +PT_BUNDLE_WINDOWS = tor-pluggable-transports-browser-$(PT_BUNDLE_VERSION_STRING)_en-US.exe PT_BUNDLE_GNULINUX_I686 = tor-pluggable-transports-browser-gnu-linux-i686-$(PT_BUNDLE_VERSION_STRING)-dev-en-US.tar.gz PT_BUNDLE_GNULINUX_X86_64 = tor-pluggable-transports-browser-gnu-linux-x86_64-$(PT_BUNDLE_VERSION_STRING)-dev-en-US.tar.gz all: @echo "Try one of these:" + @echo $$'\tmake windows' @echo $$'\tmake gnulinux-i686' @echo $$'\tmake gnulinux-x86_64' @echo @echo "Configure version numbers at the top of this makefile." - @echo "Before starting, you need to run \"make dist\" in the flashproxy directory." + @echo "Before starting, you need to run:" + @echo $$'\t"make dist" in the flashproxy directory' + @echo "Or on Windows:" + @echo $$'\t"make dist-exe" in the flashproxy directory' + @echo $$'\t"python setup_py2exe.py py2exe" in the pyobfsproxy directory' +windows: $(PT_BUNDLE_WINDOWS) gnulinux-i686: $(PT_BUNDLE_GNULINUX_I686) gnulinux-x86_64: $(PT_BUNDLE_GNULINUX_X86_64) +$(PT_BUNDLE_WINDOWS): WORKDIR = work/windows-$(PT_BUNDLE_VERSION_STRING) + $(PT_BUNDLE_GNULINUX_I686): WORKDIR = work/gnulinux-i686-$(PT_BUNDLE_VERSION_STRING) $(PT_BUNDLE_GNULINUX_I686): BUNDLE_GNULINUX = $(BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): WORKDIR = work/gnulinux-x86_64-$(PT_BUNDLE_VERSION_STRING) $(PT_BUNDLE_GNULINUX_X86_64): BUNDLE_GNULINUX = $(BUNDLE_GNULINUX_X86_64) +$(PT_BUNDLE_WINDOWS): TBBDIR = $(WORKDIR)/Tor Browser +$(PT_BUNDLE_WINDOWS): + # Download and check signature. + $(MAKE) checksig-$(BUNDLE_WINDOWS) + + rm -rf "$(WORKDIR)" + mkdir -p "$(WORKDIR)" + "$(P7Z)" x -o"$(WORKDIR)" "$(BUNDLE_WINDOWS)" + + cp -nr "$(FLASHPROXY_DIST_WIN32)"/{*.pyd,*.dll,*.exe,*.zip} "$(TBBDIR)"/App + mkdir -p "$(TBBDIR)"/Docs/FlashProxy + cp "$(FLASHPROXY_DIST_WIN32)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Docs/FlashProxy + cp -nr "$(PYOBFSPROXY_DIST_WIN32)"/{*.pyd,*.dll,*.exe,*.zip} "$(TBBDIR)"/App + mkdir -p "$(TBBDIR)"/Docs/PyObfsproxy + cp "$(PYOBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Docs/PyObfsproxy + + cat bundle-torrc-windows >> "$(TBBDIR)"/Data/Tor/torrc + + # 7zg (as opposed to 7z) causes the self-extractor to show a GUI. + cd "$(WORKDIR)" && "$(P7ZG)" a -sfx "$@" "Tor Browser" + mv "$(WORKDIR)/$@" . + # Shared GNU/Linux 32-bit and 64-bit target. $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): TBBDIR = $(WORKDIR)/tor-browser_en-US $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): @@ -66,6 +103,9 @@ $(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): tar czf "$@" -C "$(WORKDIR)" tor-browser_en-US # Download targets. +$(BUNDLE_WINDOWS) $(BUNDLE_WINDOWS).asc: + rm -f "$@" + wget --no-clobber "$(BUNDLE_DIST_URL)/$@" $(BUNDLE_GNULINUX_I686) $(BUNDLE_GNULINUX_I686).asc \ $(BUNDLE_GNULINUX_X86_64) $(BUNDLE_GNULINUX_X86_64).asc: rm -f "$@" @@ -76,4 +116,4 @@ checksig-%: % %.asc # Need Bash for certain wildcards. SHELL = /bin/bash -.PHONY: checksig-% gnulinux-i686 gnulinux-x86_64 +.PHONY: checksig-% windows gnulinux-i686 gnulinux-x86_64 diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt index 859122e..f05c05b 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -180,42 +180,18 @@ Clone pyobfsproxy and run py2exe on it. $ cd pyobfsproxy $ /cygdrive/c/Python27/python.exe setup_py2exe.py py2exe -Download the browser bundle from +Enter the doc directory and edit the top of Makefile to set the version +numbers you want to use. + BUNDLE_VERSION = ... + BUNDLE_RELEASE = ... + PT_BUNDLE_RELEASE = pt1 +The latest Tor Browser Bundle version number can be found at https://www.torproject.org/projects/torbrowser.html.en#Download-torbrowserb…. +PT_BUNDLE_RELEASE release should increment each time you build a new +bundle with the same BUNDLE_VERSION and BUNDLE_RELEASE, and be reset to +"pt1" when either of those change. -https://www.torproject.org/dist/torbrowser/tor-browser-2.4.11-alpha-1_en-US.exe -https://www.torproject.org/dist/torbrowser/tor-browser-2.4.11-alpha-1_en-US.exe.asc - -Extract the bundle. - - $ gpg --verify tor-browser-2.4.11-alpha-1_en-US.exe.asc - $ rm -r "Tor Browser" - $ "/cygdrive/c/Program Files (x86)/7-Zip/7z" x tor-browser-2.4.11-alpha-1_en-US.exe - -Copy files into the bundle. The -n option to cp prevents the existing -LIBEAY32.dll and SSLEAY32.dll from being overwritten. - - $ cd "Tor Browser" - $ cp -nr ~/flashproxy/dist/flashproxy-client-VERSION-win32/{*.pyd,*.dll,*.exe,*.zip} App - $ mkdir -p Docs/FlashProxy - $ cp ~/flashproxy/dist/flashproxy-client-VERSION-win32/{doc/*,README,LICENSE,ChangeLog} Docs/FlashProxy - $ cp -nr ~/pyobfsproxy/py2exe_bundle/dist/{*.pyd,*.dll,*.exe,*.zip} App - $ mkdir -p Docs/PyObfsproxy - $ cp ~/pyobfsproxy/{LICENSE,README} Docs/PyObfsproxy - -Append bundle-torrc-windows to the end of Data/Tor/torrc. - - $ cat ~/flashproxy/doc/bundle-torrc-windows >> Data/Tor/torrc - -Re-zip the bundle. The "alpha" number should be independent of the -browser bundle's alpha. The 7zg program (as opposed to 7z) causes the -self-extractor to show a GUI. - - $ cd .. - $ "/cygdrive/c/Program Files (x86)/7-Zip/7zg" a -sfx tor-pluggable-transports-browser-2.4.11-alpha-1_en-US.exe "Tor Browser" + $ make windows Test running the bundle. Extract into a separate directory, double-click the icon and "Start Tor Browser.exe". - - $ mkdir tmp - $ cp tor-pluggable-transports-browser-2.4.11-alpha-1_en-US.exe tmp

1 0

[flashproxy/master] Rename flashproxy-pyobfsproxy to pluggable-transports in bundle file names.
by dcf＠torproject.org 07 Apr '13

07 Apr '13

commit a4e362a2ef3ebb5af91d1229e73d71f8ca70275f Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 6 17:12:10 2013 -0700 Rename flashproxy-pyobfsproxy to pluggable-transports in bundle file names. --- doc/bundle-gnulinux.txt | 6 +++--- doc/bundle-macosx.txt | 6 +++--- doc/bundle-windows.txt | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt index 5440e2c..7d4778e 100644 --- a/doc/bundle-gnulinux.txt +++ b/doc/bundle-gnulinux.txt @@ -129,14 +129,14 @@ Re-zip the bundle. The "alpha" number should be independent of the browser bundle's alpha. $ cd .. - $ tar czvf tor-flashproxy-pyobfsproxy-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz tor-browser_en-US + $ tar czvf tor-pluggable-transports-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz tor-browser_en-US Test running the bundle. Extract into a separate directory, double-click the icon to unzip, and run TorBrowser_en-US.app. $ mkdir tmp - $ cp tor-flashproxy-pyobfsproxy-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz tmp + $ cp tor-pluggable-transports-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz tmp $ cd tmp - $ tar xzvf tor-flashproxy-pyobfsproxy-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz + $ tar xzvf tor-pluggable-transports-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz $ cd tor-browser_en-US $ ./start-tor-browser diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index cfdca55..dc3118e 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -115,11 +115,11 @@ Re-zip the bundle. The "alpha" number should be independent of the browser bundle's alpha. $ cd .. - $ rm -f TorBrowser-FlashProxy-PyObfsproxy-2.4.11-alpha-1-osx-i386-en-US.zip - $ zip -r -9 TorBrowser-FlashProxy-PyObfsproxy-2.4.11-alpha-1-osx-i386-en-US.zip TorBrowser_en-US.app/ + $ rm -f TorBrowser-Pluggable-Transports-2.4.11-alpha-1-osx-i386-en-US.zip + $ zip -r -9 TorBrowser-Pluggable-Transports-2.4.11-alpha-1-osx-i386-en-US.zip TorBrowser_en-US.app/ Test running the bundle. Extract into a separate directory, double-click the icon to unzip, and run TorBrowser_en-US.app. $ mkdir tmp - $ cp TorBrowser-FlashProxy-PyObfsproxy-2.4.11-alpha-1-osx-i386-en-US.zip tmp + $ cp TorBrowser-Pluggable-Transports-2.4.11-alpha-1-osx-i386-en-US.zip tmp diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt index 83115a6..859122e 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -212,10 +212,10 @@ browser bundle's alpha. The 7zg program (as opposed to 7z) causes the self-extractor to show a GUI. $ cd .. - $ "/cygdrive/c/Program Files (x86)/7-Zip/7zg" a -sfx tor-flashproxy-pyobfsproxy-browser-2.4.11-alpha-1_en-US.exe "Tor Browser" + $ "/cygdrive/c/Program Files (x86)/7-Zip/7zg" a -sfx tor-pluggable-transports-browser-2.4.11-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-pyobfsproxy-browser-2.4.11-alpha-1_en-US.exe tmp + $ cp tor-pluggable-transports-browser-2.4.11-alpha-1_en-US.exe tmp

1 0

[flashproxy/master] Move the bundle torrc appendixes into separate files.
by dcf＠torproject.org 07 Apr '13

07 Apr '13

commit 84cc9046e7c7765f307ddb4fce87288ff40e3a61 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 6 16:09:33 2013 -0700 Move the bundle torrc appendixes into separate files. --- doc/bundle-gnulinux.txt | 30 +++--------------------------- doc/bundle-macosx.txt | 30 +++--------------------------- doc/bundle-torrc-gnulinux | 26 ++++++++++++++++++++++++++ doc/bundle-torrc-macosx | 26 ++++++++++++++++++++++++++ doc/bundle-torrc-windows | 26 ++++++++++++++++++++++++++ doc/bundle-windows.txt | 30 +++--------------------------- 6 files changed, 87 insertions(+), 81 deletions(-) diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt index ca1f42e..5440e2c 100644 --- a/doc/bundle-gnulinux.txt +++ b/doc/bundle-gnulinux.txt @@ -121,33 +121,9 @@ Copy files into the bundle. $ cp ~/pyobfsproxy/{LICENSE,README} Docs/PyObfsproxy $ find App -name '*.pyc' | xargs rm -f -Make the second half of Data/Tor/torrc look like this. - -UseBridges 1 -# The address and port are ignored by the client transport plugin. -Bridge websocket 0.0.1.0:1 - -Bridge obfs2 109.163.233.198:1051 -Bridge obfs2 83.212.100.216:47870 -Bridge obfs2 83.212.96.182:46602 -Bridge obfs2 109.105.109.163:46924 -Bridge obfs2 70.182.182.109:54542 -Bridge obfs2 169.229.59.74:32779 -Bridge obfs2 169.229.59.75:47809 -Bridge obfs2 209.141.36.236:60783 -Bridge obfs2 208.79.90.242:55564 -Bridge obfs2 128.31.0.34:1051 -Bridge obfs2 83.212.101.2:45235 - -Bridge obfs3 83.212.101.2:42782 - -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 ./App/flashproxy-client --register :0 :9000 -ClientTransportPlugin obfs2,obfs3 exec ./App/pyobfsproxy managed +Append bundle-torrc-gnulinux to the end of Data/Tor/torrc. + + $ cat ~/flashproxy/doc/bundle-torrc-gnulinux >> Data/Tor/torrc Re-zip the bundle. The "alpha" number should be independent of the browser bundle's alpha. diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index d95bdf9..cfdca55 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -107,33 +107,9 @@ Copy files into the bundle. $ cp ~/pyobfsproxy/{LICENSE,README} Contents/Resources/Docs/PyObfsproxy $ find Contents/MacOS -name '*.pyc' | xargs rm -f -Make the second half of Library/Vidalia/torrc look like this. - -UseBridges 1 -# The address and port are ignored by the client transport plugin. -Bridge websocket 0.0.1.0:1 - -Bridge obfs2 109.163.233.198:1051 -Bridge obfs2 83.212.100.216:47870 -Bridge obfs2 83.212.96.182:46602 -Bridge obfs2 109.105.109.163:46924 -Bridge obfs2 70.182.182.109:54542 -Bridge obfs2 169.229.59.74:32779 -Bridge obfs2 169.229.59.75:47809 -Bridge obfs2 209.141.36.236:60783 -Bridge obfs2 208.79.90.242:55564 -Bridge obfs2 128.31.0.34:1051 -Bridge obfs2 83.212.101.2:45235 - -Bridge obfs3 83.212.101.2:42782 - -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 -ClientTransportPlugin obfs2,obfs3 exec pyobfsproxy managed +Append bundle-torrc-macosx to the end of Library/Vidalia/torrc. + + $ cat ~/flashproxy/doc/bundle-torrc-macosx >> Library/Vidalia/torrc Re-zip the bundle. The "alpha" number should be independent of the browser bundle's alpha. diff --git a/doc/bundle-torrc-gnulinux b/doc/bundle-torrc-gnulinux new file mode 100644 index 0000000..3dc7b16 --- /dev/null +++ b/doc/bundle-torrc-gnulinux @@ -0,0 +1,26 @@ + +UseBridges 1 +# The address and port are ignored by the client transport plugin. +Bridge websocket 0.0.1.0:1 + +Bridge obfs2 109.163.233.198:1051 +Bridge obfs2 83.212.100.216:47870 +Bridge obfs2 83.212.96.182:46602 +Bridge obfs2 109.105.109.163:46924 +Bridge obfs2 70.182.182.109:54542 +Bridge obfs2 169.229.59.74:32779 +Bridge obfs2 169.229.59.75:47809 +Bridge obfs2 209.141.36.236:60783 +Bridge obfs2 208.79.90.242:55564 +Bridge obfs2 128.31.0.34:1051 +Bridge obfs2 83.212.101.2:45235 + +Bridge obfs3 83.212.101.2:42782 + +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 ./App/flashproxy-client --register :0 :9000 +ClientTransportPlugin obfs2,obfs3 exec ./App/pyobfsproxy managed diff --git a/doc/bundle-torrc-macosx b/doc/bundle-torrc-macosx new file mode 100644 index 0000000..4624f68 --- /dev/null +++ b/doc/bundle-torrc-macosx @@ -0,0 +1,26 @@ + +UseBridges 1 +# The address and port are ignored by the client transport plugin. +Bridge websocket 0.0.1.0:1 + +Bridge obfs2 109.163.233.198:1051 +Bridge obfs2 83.212.100.216:47870 +Bridge obfs2 83.212.96.182:46602 +Bridge obfs2 109.105.109.163:46924 +Bridge obfs2 70.182.182.109:54542 +Bridge obfs2 169.229.59.74:32779 +Bridge obfs2 169.229.59.75:47809 +Bridge obfs2 209.141.36.236:60783 +Bridge obfs2 208.79.90.242:55564 +Bridge obfs2 128.31.0.34:1051 +Bridge obfs2 83.212.101.2:45235 + +Bridge obfs3 83.212.101.2:42782 + +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 +ClientTransportPlugin obfs2,obfs3 exec pyobfsproxy managed diff --git a/doc/bundle-torrc-windows b/doc/bundle-torrc-windows new file mode 100644 index 0000000..4624f68 --- /dev/null +++ b/doc/bundle-torrc-windows @@ -0,0 +1,26 @@ + +UseBridges 1 +# The address and port are ignored by the client transport plugin. +Bridge websocket 0.0.1.0:1 + +Bridge obfs2 109.163.233.198:1051 +Bridge obfs2 83.212.100.216:47870 +Bridge obfs2 83.212.96.182:46602 +Bridge obfs2 109.105.109.163:46924 +Bridge obfs2 70.182.182.109:54542 +Bridge obfs2 169.229.59.74:32779 +Bridge obfs2 169.229.59.75:47809 +Bridge obfs2 209.141.36.236:60783 +Bridge obfs2 208.79.90.242:55564 +Bridge obfs2 128.31.0.34:1051 +Bridge obfs2 83.212.101.2:45235 + +Bridge obfs3 83.212.101.2:42782 + +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 +ClientTransportPlugin obfs2,obfs3 exec pyobfsproxy managed diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt index dd7477d..83115a6 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -203,33 +203,9 @@ LIBEAY32.dll and SSLEAY32.dll from being overwritten. $ mkdir -p Docs/PyObfsproxy $ cp ~/pyobfsproxy/{LICENSE,README} Docs/PyObfsproxy -Make the second half of Data/Tor/torrc look like this. - -UseBridges 1 -# The address and port are ignored by the client transport plugin. -Bridge websocket 0.0.1.0:1 - -Bridge obfs2 109.163.233.198:1051 -Bridge obfs2 83.212.100.216:47870 -Bridge obfs2 83.212.96.182:46602 -Bridge obfs2 109.105.109.163:46924 -Bridge obfs2 70.182.182.109:54542 -Bridge obfs2 169.229.59.74:32779 -Bridge obfs2 169.229.59.75:47809 -Bridge obfs2 209.141.36.236:60783 -Bridge obfs2 208.79.90.242:55564 -Bridge obfs2 128.31.0.34:1051 -Bridge obfs2 83.212.101.2:45235 - -Bridge obfs3 83.212.101.2:42782 - -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 -ClientTransportPlugin obfs2,obfs3 exec pyobfsproxy managed +Append bundle-torrc-windows to the end of Data/Tor/torrc. + + $ cat ~/flashproxy/doc/bundle-torrc-windows >> Data/Tor/torrc Re-zip the bundle. The "alpha" number should be independent of the browser bundle's alpha. The 7zg program (as opposed to 7z) causes the

1 0