From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 25 Oct 2012 14:19:46 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.3'
X-Git-Tag: tor-0.2.4.5-alpha~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4abac08a2ade5329594dcc220a02b3b680cb9e8;p=thirdparty%2Ftor.git

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

(Using an -s ours merge for Not taking the CVE-2012-2250 fix from
maint-0.2.3; it would conflict.)
---

e4abac08a2ade5329594dcc220a02b3b680cb9e8