From: Nick Mathewson Date: Thu, 12 Mar 2015 16:50:41 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 X-Git-Tag: tor-0.2.7.1-alpha~134^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2dcd9b703b494b404200c6330ef9f0511b79925;p=thirdparty%2Ftor.git Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 ("-s ours" merge to avoid taking reversion of #15064) --- c2dcd9b703b494b404200c6330ef9f0511b79925