From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 4 Feb 2013 16:54:38 +0000 (-0500)
Subject: Merge branch 'bug8153'
X-Git-Tag: tor-0.2.4.10-alpha~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=898f2d7c278442d2c4fbdf0126eaa406d503d088;p=thirdparty%2Ftor.git

Merge branch 'bug8153'
---

898f2d7c278442d2c4fbdf0126eaa406d503d088