[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [flashproxy/master] Use the normal browser bundle rather than the obfsproxy bundle.
commit 5cc72d6d084308463e8ba052233f6e77ac5caaad
Author: David Fifield <david@xxxxxxxxxxxxxxx>
Date: Wed Mar 6 08:57:19 2013 -0800
Use the normal browser bundle rather than the obfsproxy bundle.
---
doc/bundle-gnulinux.txt | 28 +++++++++++-----------------
doc/bundle-macosx.txt | 22 ++++++++--------------
doc/bundle-windows.txt | 22 ++++++++--------------
3 files changed, 27 insertions(+), 45 deletions(-)
diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt
index dab8f22..a2807c7 100644
--- a/doc/bundle-gnulinux.txt
+++ b/doc/bundle-gnulinux.txt
@@ -87,26 +87,25 @@ Clone pyobfsproxy.
$ git clone https://git.torproject.org/user/asn/pyobfsproxy.git -b obfs3_take2
-Within the VM, download the 32-bit or 64-bit obfsproxy bundle from
-https://www.torproject.org/projects/obfsproxy. The instructions below
-are for the 32-bit (i686) version.
+Within the VM, download the 32-bit or 64-bit browser bundle from
+https://www.torproject.org/projects/torbrowser.html.en#Download-torbrowserbundlealpha.
+The instructions below are for the 32-bit (i686) version.
-https://www.torproject.org/dist/torbrowser/linux/tor-obfsproxy-browser-gnu-linux-i686-2.4.7-alpha-1-dev-en-US.tar.gz
-https://www.torproject.org/dist/torbrowser/linux/tor-obfsproxy-browser-gnu-linux-i686-2.4.7-alpha-1-dev-en-US.tar.gz.asc
+https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-i686-2.4.10-alpha-2-dev-en-US.tar.gz
+https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-i686-2.4.10-alpha-2-dev-en-US.tar.gz.asc
-https://www.torproject.org/dist/torbrowser/linux/tor-obfsproxy-browser-gnu-linux-x86_64-2.4.7-alpha-1-dev-en-US.tar.gz
-https://www.torproject.org/dist/torbrowser/linux/tor-obfsproxy-browser-gnu-linux-x86_64-2.4.7-alpha-1-dev-en-US.tar.gz.asc
+https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-2.4.10-alpha-2-dev-en-US.tar.gz
+https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-2.4.10-alpha-2-dev-en-US.tar.gz.asc
Extract the bundle.
- $ gpg --verify tor-obfsproxy-browser-gnu-linux-i686-2.4.7-alpha-1-dev-en-US.tar.gz.asc
+ $ gpg --verify tor-browser-gnu-linux-i686-2.4.10-alpha-2-dev-en-US.tar.gz.asc
$ rm -r tor-browser_en-US
- $ tar xzvf tor-obfsproxy-browser-gnu-linux-i686-2.4.7-alpha-1-dev-en-US.tar.gz
+ $ tar xzvf tor-browser-gnu-linux-i686-2.4.10-alpha-2-dev-en-US.tar.gz
Copy files into the bundle.
$ cd tor-browser_en-US
- $ rm -f App/obfsproxy
$ cp ~/flashproxy/dist/flashproxy-client-VERSION/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http} App
$ cp -rL /usr/lib/pymodules/python2.6/M2Crypto App
$ mkdir -p Docs/FlashProxy
@@ -119,12 +118,7 @@ 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 (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 "./App/flashproxy-client". You are
-also changing "--managed" to "managed" in the obfsproxy
-ClientTransportPlugin line.
+Make the second half of Data/Tor/torrc look like this.
UseBridges 1
# The address and port are ignored by the client transport plugin.
@@ -142,7 +136,7 @@ ClientTransportPlugin websocket exec ./App/flashproxy-client --register :0 :9000
ClientTransportPlugin obfs2,obfs3 exec ./App/obfsproxy.py managed
Re-zip the bundle. The "alpha" number should be independent of the
-obfsproxy bundle's alpha.
+browser bundle's alpha.
$ cd ..
$ tar czvf tor-flashproxy-pyobfsproxy-browser-gnu-linux-i686-2.4.6-alpha-1-dev-en-US.tar.gz tor-browser_en-US
diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt
index 851b456..93c8310 100644
--- a/doc/bundle-macosx.txt
+++ b/doc/bundle-macosx.txt
@@ -68,22 +68,21 @@ Clone pyobfsproxy.
$ git clone https://git.torproject.org/user/asn/pyobfsproxy.git -b obfs3_take2
-Download the 32-bit obfsproxy bundle from
-https://www.torproject.org/projects/obfsproxy.
+Download the 32-bit browser bundle from
+https://www.torproject.org/projects/torbrowser.html.en#Download-torbrowserbundlealpha.
-https://www.torproject.org/dist/torbrowser/osx/TorBrowser-Obfsproxy-2.4.7-alpha-1-osx-i386-en-US.zip
-https://www.torproject.org/dist/torbrowser/osx/TorBrowser-Obfsproxy-2.4.7-alpha-1-osx-i386-en-US.zip.asc
+https://www.torproject.org/dist/torbrowser/osx/TorBrowser-2.4.10-alpha-2-osx-i386-en-US.zip
+https://www.torproject.org/dist/torbrowser/osx/TorBrowser-2.4.10-alpha-2-osx-i386-en-US.zip.asc
Extract the bundle.
- $ gpg --verify TorBrowser-Obfsproxy-2.4.7-alpha-1-osx-i386-en-US.zip.asc
+ $ gpg --verify TorBrowser-2.4.10-alpha-2-osx-i386-en-US.zip.asc
$ rm -r TorBrowser_en-US.app
- $ unzip TorBrowser-Obfsproxy-2.4.7-alpha-1-osx-i386-en-US.zip
+ $ unzip TorBrowser-2.4.10-alpha-2-osx-i386-en-US.zip
Copy files into the bundle.
$ cd TorBrowser_en-US.app
- $ rm -f Contents/MacOS/obfsproxy
$ 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
@@ -95,12 +94,7 @@ Copy files into the bundle.
$ find App -name '*.pyc' | xargs rm -f
$ find Contents/MacOS -name '*.pyc' | xargs rm -f
-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". You are also
-changing "--managed" to "managed" and "obfsproxy" to "obfsproxy.py" in
-the obfsproxy ClientTransportPlugin line.
+Make the second half of Library/Vidalia/torrc look like this.
UseBridges 1
# The address and port are ignored by the client transport plugin.
@@ -118,7 +112,7 @@ ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000
ClientTransportPlugin obfs2,obfs3 exec obfsproxy.py managed
Re-zip the bundle. The "alpha" number should be independent of the
-obfsproxy bundle's alpha.
+browser bundle's alpha.
$ cd ..
$ rm -f TorBrowser-FlashProxy-PyObfsproxy-2.4.7-alpha-1-osx-i386-en-US.zip
diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt
index 0dfbd94..55d9296 100644
--- a/doc/bundle-windows.txt
+++ b/doc/bundle-windows.txt
@@ -77,23 +77,22 @@ Clone pyobfsproxy and run PyInstaller on it.
$ git clone https://git.torproject.org/user/asn/pyobfsproxy.git -b obfs3_take2
$ /cygdrive/c/Python27/python.exe ../pyinstaller-2.0/pyinstaller.py obfsproxy.py
-Download the obfsproxy bundle from
-https://www.torproject.org/projects/obfsproxy.
+Download the browser bundle from
+https://www.torproject.org/projects/torbrowser.html.en#Download-torbrowserbundlealpha.
-https://www.torproject.org/dist/torbrowser/tor-obfsproxy-browser-2.4.7-alpha-1_en-US.exe
-https://www.torproject.org/dist/torbrowser/tor-obfsproxy-browser-2.4.7-alpha-1_en-US.exe.asc
+https://www.torproject.org/dist/torbrowser/tor-browser-2.4.10-alpha-2_en-US.exe
+https://www.torproject.org/dist/torbrowser/tor-browser-2.4.10-alpha-2_en-US.exe.asc
Extract the bundle.
- $ gpg --verify tor-obfsproxy-browser-2.4.7-alpha-1_en-US.exe.asc
+ $ gpg --verify tor-browser-2.4.10-alpha-2_en-US.exe.asc
$ rm -r "Tor Browser"
- $ "/cygdrive/c/Program Files (x86)/7-Zip/7z" x tor-obfsproxy-browser-2.4.7-alpha-1_en-US.exe
+ $ "/cygdrive/c/Program Files (x86)/7-Zip/7z" x tor-browser-2.4.10-alpha-2_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"
- $ rm -f App/obfsproxy.exe
$ 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,ChangeLog} Docs/FlashProxy
@@ -101,12 +100,7 @@ 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 (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". You are also
-changing "--managed" to "managed" in the obfsproxy ClientTransportPlugin
-line.
+Make the second half of Data/Tor/torrc look like this.
UseBridges 1
# The address and port are ignored by the client transport plugin.
@@ -124,7 +118,7 @@ ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000
ClientTransportPlugin obfs2,obfs3 exec obfsproxy managed
Re-zip the bundle. The "alpha" number should be independent of the
-obfsproxy bundle's alpha. The 7zg program (as opposed to 7z) causes the
+browser bundle's alpha. The 7zg program (as opposed to 7z) causes the
self-extractor to show a GUI.
$ cd ..
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits