From: Roger Dingledine <arma@torproject.org>
Date: Sun, 25 Sep 2011 02:47:53 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.5-alpha~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88516f65c9753d6ec60dd7cb0c28c3ff91fdb101;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

88516f65c9753d6ec60dd7cb0c28c3ff91fdb101