From: Roger Dingledine <arma@torproject.org>
Date: Fri, 28 Oct 2011 00:03:21 +0000 (-0400)
Subject: Merge branch 'maint-0.2.1' into maint-0.2.2
X-Git-Tag: tor-0.2.3.7-alpha~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c2ca5b52f0d8eb504cff0e80ac6366e87224ead;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.1' into maint-0.2.2
---

9c2ca5b52f0d8eb504cff0e80ac6366e87224ead