From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 20 Oct 2010 17:45:53 +0000 (-0400)
Subject: Merge branch 'bug2097' into maint-0.2.2
X-Git-Tag: tor-0.2.2.18-alpha~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c2323f1340449d135ce698631cefbd1e546a9fe3;p=thirdparty%2Ftor.git

Merge branch 'bug2097' into maint-0.2.2
---

c2323f1340449d135ce698631cefbd1e546a9fe3