Per #10314, we are seeking to replace obfs2 with obfs3.

This is only for the gnulinux-x86_64 bundle, in accordance with the
vanilla bundles where this version number exists only for x86_64.

https://blog.torproject.org/blog/64-bit-gnulinux-tor-browser-bundles-updated

It's included in upstream bundles now.

This is to work around a change in OS X 10.9, where application bundles
launched by Finder have a working directory of "/". We find out where we
live by taking the basename of the shim script, and set that as the
current directory before launching the real tor executable.

Without having the current directory set, tor can't find its pluggable
transport executables.

This reverts commit 590f02e9.
This reverts commit c078c2fc.

ac52cd37 caused Makefile to look in directories with a "-win32" suffix;
we need to tell the flashproxy Makefile to use the same suffix.

This is the error I was getting:

cp -Rn "work/windows-2.4.17-rc-1-pt1/flashproxy/dist/flashproxy-client-win32"/{*.pyd,*.dll,*.exe,*.zip} "work/windows-2.4.17-rc-1-pt1/Tor Browser"/App
cp: cannot stat `work/windows-2.4.17-rc-1-pt1/flashproxy/dist/flashproxy-client-win32/*.pyd': No such file or directory
cp: cannot stat `work/windows-2.4.17-rc-1-pt1/flashproxy/dist/flashproxy-client-win32/*.dll': No such file or directory
cp: cannot stat `work/windows-2.4.17-rc-1-pt1/flashproxy/dist/flashproxy-client-win32/*.exe': No such file or directory
cp: cannot stat `work/windows-2.4.17-rc-1-pt1/flashproxy/dist/flashproxy-client-win32/*.zip': No such file or directory
Makefile:89: recipe for target `tor-pluggable-transports-browser-2.4.17-rc-1-pt1_en-US.exe' failed

work/windows-2.4.17-rc-1-pt1/flashproxy/dist/flashproxy-client existed,
but not the same directory with a "-win32" suffix.

Revert obfs-flash specific changes; we want to keep that on a separate branch for now.

Partially revert "update obfs-flash tag to catch missed dependencies, and warn about using zipped eggs"
This partially reverts commit 46c91e38.

Revert "add CREATE_BREAKAWAY_FROM_JOB workaround for the windows version, see #10006 for details"
This reverts commit 34057539.

Revert "update pyptlib/obfs-flash tags to include the latest fixes for windows"
This reverts commit 54b023ed.

Revert "Merge branch 'obfs-flash'"
This reverts commit d1242c90, reversing
changes made to a072dd20.

Conflicts:
	Makefile
	bundle-torrc-windows

Previously it was done implicitly by --register-methods=http.

That it was out of date was reported by kpdyer in #9939.