From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 12 Sep 2012 19:38:33 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.3'
X-Git-Tag: tor-0.2.4.3-alpha~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=79b31dd4f8b45d9c68fa33dcd564deb60a26286e;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.3'

Use the "ours" strategy so that we retain 4aff97cfc796, which maint-0.2.3
just reverted.
---

79b31dd4f8b45d9c68fa33dcd564deb60a26286e