From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 30 May 2012 21:00:36 +0000 (-0400)
Subject: Merge branch 'bug5604'
X-Git-Tag: tor-0.2.3.16-alpha~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe68a80f8f1e687d9e3dcdf6dfc5d0a8f3524335;p=thirdparty%2Ftor.git

Merge branch 'bug5604'
---

fe68a80f8f1e687d9e3dcdf6dfc5d0a8f3524335