[tor-commits] [flashproxy/master] Uniformity in bundle-windows.txt.

[dcf at torproject.org]

commit 740f35f2a1ae7537a0bf90ff591454d6e13f6e83
Author: David Fifield <david at bamsoftware.com>
Date:   Sun Jan 6 18:48:30 2013 -0800

    Uniformity in bundle-windows.txt.
---
 doc/bundle-windows.txt |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt
index 7b5af89..0dfbd94 100644
--- a/doc/bundle-windows.txt
+++ b/doc/bundle-windows.txt
@@ -64,18 +64,17 @@ http://twistedmatrix.com/Releases/twisted-12.3.0-md5sums.txt
 	$ cd pyptlib
 	$ /cygdrive/c/Python27/python.exe setup.py install
 
-=== pyobfsproxy
+== Browser bundle
 
-Just download this; it will be packaged with PyInstaller in the next
-step.
+Clone and build the flashproxy source.
 
-	$ git clone https://git.torproject.org/user/asn/pyobfsproxy.git -b obfs3_take2
+	$ git clone https://git.torproject.org/flashproxy.git
+	$ cd flashproxy
+	$ make dist-exe
 
-== Browser bundle
+Clone pyobfsproxy and run PyInstaller on it.
 
-Run in the flashproxy source directory:
-	$ make dist-exe
-Run in the pyobfsproxy source directory:
+	$ 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
@@ -102,11 +101,12 @@ 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).
+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.
+changing "--managed" to "managed" in the obfsproxy ClientTransportPlugin
+line.
 
 UseBridges 1
 # The address and port are ignored by the client transport plugin.