26/04/14 11:54, intrigeri wrote:
> Hi,
>
> anonym wrote (24 Apr 2014 17:53:16 GMT) :
>> 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.
>
> This looks good to me. sajolida is going to test and merge this.
Excellent!
>> 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.
>
> There's something wrong there: the
> debian-tor-0.2.4.21-1+tails1_d70.wheezy+1 tag points to the same
> commit as the debian-tor-0.2.4.21-1+tails1_d60.squeeze+1 one.
>
> Please fix that part and resubmit ASAP (it feels wrong to have a newer
> Tor on our stable branch than on the devel one). Thanks!
Sorry about this. I've pushed a correct tag now. I've verified that the
respective .debs were built from the correct commits according to `tor
--version`, so this problem shouldn't have messed anything up. I
remember that I redid the tags because I had messed up the tag message,
and this must be when I mixed things up.
Cheers!
