From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 10 May 2012 19:44:41 +0000 (-0400)
Subject: Merge branch 'bug5786'
X-Git-Tag: tor-0.2.3.16-alpha~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b1a334842f632b935d0b23757722d06bd145724;p=thirdparty%2Ftor.git

Merge branch 'bug5786'
---

0b1a334842f632b935d0b23757722d06bd145724