From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 21 Aug 2012 15:20:58 +0000 (-0400)
Subject: Merge branch 'bug6638'
X-Git-Tag: tor-0.2.4.1-alpha~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64676d05714a8248610bdbbc6270966ed440a33c;p=thirdparty%2Ftor.git

Merge branch 'bug6638'
---

64676d05714a8248610bdbbc6270966ed440a33c