commit 3550c9ed5e74e4ceb4e6e180f20e5fba8c2fa2b8 Author: David Fifield david@bamsoftware.com Date: Wed Mar 6 12:34:38 2013 -0800

New pyobfsproxy executable name in OS X bundles. --- 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 c08557d..2a498cf 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -89,7 +89,7 @@ Copy files into the bundle. $ 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,obfsproxy.py} Contents/MacOs + $ cp -r ~/pyobfsproxy/{obfsproxy,bin/pyobfsproxy} Contents/MacOs $ cp -r ~/bundle/usr/lib/python2.7/site-packages/{Crypto,pyptlib} Contents/MacOS $ mkdir -p Contents/Resources/Docs/PyObfsproxy $ cp ~/pyobfsproxy/{LICENSE,README} Contents/Resources/Docs/PyObfsproxy @@ -121,7 +121,7 @@ CircuitBuildTimeout 60 # 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 obfsproxy.py managed +ClientTransportPlugin obfs2,obfs3 exec pyobfsproxy managed

Re-zip the bundle. The "alpha" number should be independent of the browser bundle's alpha.