From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 2 Aug 2010 16:53:52 +0000 (-0400)
Subject: Merge branch 'bug1384'
X-Git-Tag: tor-0.2.2.15-alpha~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9265190b16cae3b95f73bfb478e97b4fcfba0e17;p=thirdparty%2Ftor.git

Merge branch 'bug1384'
---

9265190b16cae3b95f73bfb478e97b4fcfba0e17