Combined pluggable transports bundle
Make a Tor Browser Bundle that has both flash proxy and pyobfsproxy built in, and both enabled by default.
This will involve amending our current instructions for building the flash proxy bundle, and shipping a different torrc.
It's okay if the two projects are built separately using PyInstaller and both have their own runtimes. That's something we can improve in the future, and it's only a matter of a few megabytes.
Alexandre: talk to George about getting fresh obfs2 bridge addresses to put in the bundle.