We want to have nightlies with the new OpenSSL.
Set security.tls.version.max=1 in meek-http-helper.

#11253 set security.tls.version.max=3 (i.e., TLSv1.2).
We need to set it back to 1 (TLSv1.0) in the helper, or else we look
unlike an ordinary installation of Firefox 24.

https://trac.torproject.org/projects/tor/ticket/12766
Bumping OpenSSL without its hash does not fly.
Bug 12920: Don't apply patch for #11200 to master.

On the tor master branch #11200 is already fixed. Applying the patch
again breaks the nightly builds.
Bug 4234: Use the Firefox Update Process for TBB.

Create and deliver complete MAR files for each platform/locale combination..
Deliver a set of MAR file creation tools for Linux (32 and 64-bit).  Just in
  case someone wants to skip the Linux build, we build these tools (which are
  host tools) during the Windows and Mac builds as well.
Use the new --with-tor-browser-version configure option to pass the
  Tor Browser version to the Firefox build process.
Pass the correct update channel to the Firefox build process via the
  --enable-update-channel configure option.
Switch to build candidates directory for fetching Firefox langpacks.

This will allow us to build earlier, and also make our build hashes
reproducible in the event of a minor langpack hash change we decide to
ignore.
add hardening for Windows bundles
add --enable-reloc-section patch from skruffy
make Tor and the PTs build with our mingw compilers
Stop checking HTTPS-Everywhere's tag. We use the xpi.
Changelog draft for 4.0-alpha-2.
Add in 3.6.5 to canonical changelog.
Removed already fixed/wrongly categorized bugs.
Merge remote-tracking branch 'pc/bug4234-04'
Use the *4.x-2 branch for the updater related code.
Update changelog and bumped Tor Browser branch.
Merge remote-tracking branch 'erinn/tbb-4.x-hardening'
Bug 12103: Adding RELRO back to browser binaries.

We removed the build-id from browser binaries in bug 11042 as it turned
out that despite the contents being exactly the same the build-id was
not occasionally. But doing that with bjcopy destroyed RELRO protections
as well. Having the build-id non-deterministic seems to be an ld issue
as switching to gold solves this.
Update versions file for Torbutton and Tor Launcher.
Add Bug 12103 to changelogs.