From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 27 Sep 2010 16:25:32 +0000 (-0400)
Subject: Merge branch 'bug1805' into maint-0.2.2
X-Git-Tag: tor-0.2.2.17-alpha~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24a45f54d270d86dde456cbb45640811d1ba26c2;p=thirdparty%2Ftor.git

Merge branch 'bug1805' into maint-0.2.2
---

24a45f54d270d86dde456cbb45640811d1ba26c2