From: Nick Mathewson Date: Sun, 18 Jan 2015 18:49:30 +0000 (-0500) Subject: Merge remote-tracking branch 'public/bug12485' X-Git-Tag: tor-0.2.6.3-alpha~140 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79e12da86199fbfcf44aa7e569ea2d938156108b;p=thirdparty%2Ftor.git Merge remote-tracking branch 'public/bug12485' --- 79e12da86199fbfcf44aa7e569ea2d938156108b