Re: [Tails-dev] Please review and merge feature/obfsproxy

13/11/12 20:25, Ague Mill wrote:
> anonym:
>> 12/11/12 15:11, anonym wrote:
>>> 03/11/12 09:08, intrigeri wrote:
>>>> Hi,
>>>>
>>>> anonym wrote (02 Nov 2012 20:26:34 GMT) :
>>>>> Basic (perhaps even experimental as it currently lacks documentation)
>>>>> support for obfsproxy has been added in the branch feature/obfsproxy.
>>>>> Please review and merge it into devel.
>>>>
>>>> We agreed at the Tails summit to not merge new features before their
>>>> documentation is ready. For the record, this is what allows us to
>>>> squeeze the delay before feature freeze + RC1 and RC2, because it's
>>>> now dedicated to translation work, rather than (like we used to do) to
>>>> doc writing + translations.
>>>
>>> Now done:
>>
>> I should perhaps have pointed out that I'd really to see this branch
>> merged for Tails 0.15.
>
> Confirmed working. Merged.

I've pushed some further improvements to the docs after a discussion on
#tails. Please review and merge.