From: Nick Mathewson Date: Fri, 12 Sep 2014 01:41:56 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/maint-0.2.5' X-Git-Tag: tor-0.2.6.1-alpha~125 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=974f4d2ceb0c494bc5008749928bd2d49317cf0b;p=thirdparty%2Ftor.git Merge remote-tracking branch 'origin/maint-0.2.5' (Do an "ours" merge to avoid taking version number changes) --- 974f4d2ceb0c494bc5008749928bd2d49317cf0b