From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 3 Oct 2013 02:39:27 +0000 (-0400)
Subject: Merge branch 'bug9880_fix' into maint-0.2.4
X-Git-Tag: tor-0.2.5.2-alpha~154^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bec65277abed5567458e94c05c2b94f1b84e460;p=thirdparty%2Ftor.git

Merge branch 'bug9880_fix' into maint-0.2.4
---

0bec65277abed5567458e94c05c2b94f1b84e460