From: Nick Mathewson Date: Tue, 22 Feb 2011 20:57:36 +0000 (-0500) Subject: Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 X-Git-Tag: tor-0.2.2.23-alpha~9^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84cdcc68a944b31a0b138fcf5ac5e9074c27ed5a;p=thirdparty%2Ftor.git Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 Use "ours" strategy" to avoid taking bug2402 fix. --- 84cdcc68a944b31a0b138fcf5ac5e9074c27ed5a