Add 3.6.2 and 3.6.3 back in to master branch changelog.
Relocate recommended-versions file here.
Bump Tor version and update changelog for 4.0-alpha-1.
Bump HTTPS-Everywhere to 4.0 for the TBB alpha.
Bump HTTPS-Everywhere version to the 5.0-alpha series.
Use meek 0.10.

0.10 has the patch to set network.proxy.socks_remote_dns=false within
the Firefox extension, so it doesn't have to be set in user.js.
Set a blackhole proxy in the meek-http-helper profile.

https://trac.torproject.org/projects/tor/ticket/12674

The extension manually overrides the proxy setting for every request, so
this doesn't affect the functioning of the extension. It's intended as a
failsafe to prevent network interaction in case something goes wrong and
the user manages to disable the extension and open the profile with a
normal browser window. In order to cause that to happen, I had to do:

./Browser/firefox -safe-mode -profile Data/Browser/profile.meek-http-helper/

Prior to this commit, running the above command would have given you an
ordinary unproxied Firefox. Now you will get "The proxy server is
refusing connections."
Bug 12753: Zeroing timestamps in PE headers.

Switching to a new toolchain for Windows (using Binutils 2.24 and
GCC 4.8.3) led to new problems producing Windows bundles in a reliable
fashion. Thanks to a patch by a cypherpunk we avoid differences in
PE header timestamps as one possible source for the issues mentioned
in bug 12753.
Update versions file and changelog for Torbutton 1.6.12.0.
Move url and front from torrc to bridge_prefs.js.

The alpha release uses tor 0.2.5, which can take these parameters on the
Bridge line so they don't have to be part of the ClientTransportPlugin
command.
Add an option to use meek through CloudFront.

I don't know the best way to handle this in the UI. I added two
transports, meek-google and meek-amazon, that will appear in the
selection menu.
Update changelog for meek.
Update changelog date.
Update Tor Launcher to 0.2.6.2.

Also add 3.6.4 changelog material into main changelog.
NoScript and HTTPS-Everyhwere version bump.
Update Changelog.
Changelog update.
Fixed NoScript's package name.
Apply a new patch to address a hang caused by bug11200's fix.
Fix wrong NoScript and HTTPS-Everywhere hashes.