From: Nick Mathewson Date: Wed, 23 Apr 2014 15:04:10 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/maint-0.2.4' X-Git-Tag: tor-0.2.5.4-alpha~28 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fb86c82da9afff11b05783777dc83f80b835178;p=thirdparty%2Ftor.git Merge remote-tracking branch 'origin/maint-0.2.4' This is an "ours" merge, to avoid taking the 0.2.4 version of the --- 9fb86c82da9afff11b05783777dc83f80b835178