Update OpenSSL to 1.0.1g
Update OpenSSL signing key and hashes.
Really add the OpenSSL keyring.

I wonder where GPG put it last time?
Backport fix for Bug9665.
Bump versions for 3.6beta2.
Update to bump fteproxy to 0.2.12: a simplified build process and fixes for Windows/Linux
Update default PT Bridges.
Move obfsproxy back to 0.2.4.

Moving back to last known-good. 0.2.6 won't launch either.
Fix changelog for obfsproxy3.
Do copy *.dmg too.
Don't hardcode target 'build-nightly' for subsequent builds.
Bump Tor Launcher version.

Turkish DTDs were missing.
Remove busted FTE bridges (bad fingerprints).
Document JS option changes in changelog.
Bump Torbutton version for Turkish homepage fix.
Bug 11481: Fix Nightly build failure.

Apply fix for bug 9665 only to bundles that ship tor 0.2.4.x as it
does not apply cleanly to tor 0.2.5.x.
Merge ln5's branch 'tools2'
Bug 11478: Add missing PyYAML.

Enhanced asn's patch to fix broken obfsproxy > 0.2.4.
Fixed typo in mac pluggable transport descriptor.
Bug 10356: Refactoring the bundle descriptors.