Author: anonym Date: To: The Tails public development discussion list Subject: Re: [Tails-dev] Migrating to (something closer to) the regular Tor
Browser
14/10/14 11:43, intrigeri wrote: > Hi,
>
> anonym wrote (14 Oct 2014 09:29:26 GMT) :
>> I've applied all your suggestions.
>
> Code changes look good, thanks! Not tested yet.
I also pushed a fix for an error that slipped by.
>>>> (BTW: For conflict resolution with the stuff from
>>>> feature/tor-browser-4.0, have a look at how it was done for experimental
>>>> in commit 1e9e1442e4b3ad8e82492ebd2d856ec45c02a884)
>>>
>>> I suspect I'll be able to merge feature/tor-browser-4.0 first. If this
>>> happens, then I'll let you merge the resulting testing branch into the
>>> refactoring one, and deal with the conflict resolution.
>
>> Just tell me when.
>
> Now! :)
Done. I've successfully built an image which seem to have a working Tor
Browser. Please merge into devel and testing again.
