Bug 11535: Hardcoding obfsproxy commit.

Until #11535 is getting fixed we are hardcoding commit
b58fd9e1ef264796b6bddbde5db117472fb674a0 to avoid a broken obfsproxy in
nightly builds.
Bug 11535: Hardcoding obfsproxy commit.

Until #11535 is getting fixed we are hardcoding commit
b58fd9e1ef264796b6bddbde5db117472fb674a0 do avoid a broken obfsproxy in
nightly builds.
Fix typo in commit message.

Reminder: parse your commit message carefully before committing. :(
Merge remote-tracking branch 'kpdyer/master'
Bug 11539: Update PTs when building nightlies.

We have to update branches to build the latest and greatest Pluggable
Transport code. In order to do so we need to tell update_git() the
corresponding tag.
Set the bundle version in the bundle descriptor.

We used to set the bundle version in the browser descriptor which had
the bad side-effect that we needed to rebuild the whole Tor Browser just
in order to change the bundle version. We do that now in the bundle
descriptor instead.
Version bump.

HTTPS-Everywhere has a new stable version, 3.5. Adding that to all
version files. Additionally, updating the tor, Tor Browser and
TorLauncher tag in the alpha version file.
Bug 11552: Back out HTTPS-Everywhere version bump.

Testing on Linux as well would be a good idea in the future...
Bug 11156: Fix additional case of spurious PT startup errors
Bump nightly to new FF24.5.0ESR.
Bump Tor Browser version to new ESR tag.
Bug 11586: Add licenses to bundle Docs directory.
Update NoScript to 2.6.8.20.
Add draft changelog entry for TBB 3.6.

We still need to decide on obfs3 and other transport versions, and probably
some other things too.
Bug 10120: Part 1: Refactor Linux descriptors.

We build the tools needed for the Linux descriptors separately and
preserve them. This does not (yet) include the tools in the Pluggable
Transports descriptor which will happen in an other commit.

Additonally, we enhance our clean targets in the Makefile containing not
only a target for the newly created utils component now but for the
other components as well.
Bug 11556: Fix broken bundling due to HTTPS-E 3.5.

Starting with version 3.5 HTTPS-Everywhere uses Python 2.7 for
assembling its rules in a SQLite database. This caused our bundling
step to be broken on all platforms: On Linux (Ubuntu 10.04) there is
no Python 2.7 available via the package management and the Windows and
OS X bundling descriptors missed some necessary packages.
Fix broken nightly due to patch for bug 9229.

It seems the patch for bug 9229 does not apply cleanly to the latest
tor master anymore. Make sure it gets only applied when 0.2.4 is used.
Fix broken nightly due to patch for bug 11200.

It seems the patch for bug 11200 does not apply cleanly to the latest
tor master anymore. Make sure it gets only applied when 0.2.4 is used.
Also clean the bundle marker files if any stages get cleaned.

If someone cleans a stage and then does 'make build', they probably also want
to repackage everything after building that stage.
Update documentation and TODO file.

Some of the TODO file may still be out of date. I think we have fixed most of
the hardening issues, for example, but we should double check that.