From: Nick Mathewson Date: Thu, 31 Oct 2013 18:08:57 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/maint-0.2.4' X-Git-Tag: tor-0.2.5.2-alpha~102 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8676a08362a192f17f2850359b16933c2a5786dd;p=thirdparty%2Ftor.git Merge remote-tracking branch 'origin/maint-0.2.4' Do an "ours" merge to not take the 0.2.4 fix for #9731 --- 8676a08362a192f17f2850359b16933c2a5786dd