From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 22 Dec 2013 22:20:22 +0000 (-0500)
Subject: Merge branch 'bug10465' into maint-0.2.4
X-Git-Tag: tor-0.2.4.20~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59a162f7d2048bc5e6bbc953c2bdc76a0367221b;p=thirdparty%2Ftor.git

Merge branch 'bug10465' into maint-0.2.4
---

59a162f7d2048bc5e6bbc953c2bdc76a0367221b