From: Roger Dingledine <arma@torproject.org>
Date: Wed, 28 Sep 2011 19:13:05 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.5-alpha~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e88a3bc3e1a195864c3185d16d89e090246fc55;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

4e88a3bc3e1a195864c3185d16d89e090246fc55