From: Nick Mathewson Date: Fri, 16 May 2014 13:17:34 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/maint-0.2.4' X-Git-Tag: tor-0.2.5.5-alpha~59 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef9c00f53962713e1f7866004f3b83a136cfcedc;p=thirdparty%2Ftor.git Merge remote-tracking branch 'origin/maint-0.2.4' This is an "ours" merge, to avoid taking the commit that bumped maint-0.2.4's version to 0.2.4.22-dev. --- ef9c00f53962713e1f7866004f3b83a136cfcedc