On Tue, Feb 04, 2014 at 10:49:59AM -0600, Kevin P Dyer wrote:I will try building it and let you know how it goes.
> Please see [2] for a patch that integrates fteproxy into dcf's 3.6-beta branch
> [3] of the TBB.
>
> This integration targets version v0.2.6 of fteproxy [1].
>
> asn/mikeperry - What do you need from me to merge this patch to master?
You probably want to try rebasing on the mainline tag tbb-3.5.1-build7
https://gitweb.torproject.org/builders/tor-browser-bundle.git/tag/refs/tags/tbb-3.5.1-build7,
because the pt branch has already been merged there. There were a couple
of changes related to openssl that may or may not affect you.
David Fifield
_______________________________________________ tor-dev mailing list tor-dev@xxxxxxxxxxxxxxxxxxxx https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev