[Tails-dev] [review'n'merge:1.0] feature/tor-0.2.4.21-1+tail…

Delete this message

Reply to this message
Author: anonym
Date:  
To: The Tails public development discussion list
Subject: [Tails-dev] [review'n'merge:1.0] feature/tor-0.2.4.21-1+tails1_{d60.squeeze, d70.wheezy}+1
Hi,

Please review and merge into 'stable':

Tails Git branch: feature/tor-0.2.4.21-1+tails1_d60.squeeze+1
APT suite:        feature-tor-0.2.4.21-1-tails1-d60.squeeze-1


No code was changed in Tails' Git repo, so only an APT suite merge is
needed. This will simply install Tor 0.2.4.21 with the backported fix
for Tor bug #11464 [1] (for more background, see [2]).

For the code review it may be useful to have a look at the (rather
trivial) backporting work I did, which can be found in our 'tor' Git
repo. The backporting to 0.2.4.21 can be found in isolation in the
'bug11464_backport' branch, but the packages was built from the
'debian-tor-0.2.4.21-1+tails1_d60.squeeze+1' tag. The only relevant
change that was done in addition was disabling apparmor (commit
0ea8eaa). The complete diff is pretty manageable:

    git diff
debian-tor-0.2.4.21-1..debian-tor-0.2.4.21-1+tails1_d60.squeeze+1


Separate packages was built for wheezy, so please also review and merge
into 'devel':

Tails Git branch: feature/tor-0.2.4.21-1+tails1_d70.wheezy+1
APT suite:        feature-tor-0.2.4.21-1-tails1-d70.wheezy-1


Again, only an APT suite merge is needed. The packages was built from
the 'debian-tor-0.2.4.21-1+tails1_d70.wheezy+1' tag in our 'tor' Git repo.

If this hasn't been reviewed'n'merged until Sunday, when I will start
building the Tails 1.0 image, I'll merge this myself, out of necessity.

Note: If you want to build any of the packages yourself, you need to
first run `./autogen.sh` in tor's Git root.

Cheers!

[1] https://trac.torproject.org/projects/tor/ticket/11464
[2] https://mailman.boum.org/pipermail/tails-dev/2014-April/005563.html