From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 16 Jan 2013 22:02:46 +0000 (-0500)
Subject: Merge branch 'bug5285_v2'
X-Git-Tag: tor-0.2.4.10-alpha~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b62a738b3add64dcd26a82dff44a7e9e11ff5a9;p=thirdparty%2Ftor.git

Merge branch 'bug5285_v2'
---

8b62a738b3add64dcd26a82dff44a7e9e11ff5a9