From: Roger Dingledine <arma@torproject.org>
Date: Sun, 27 Nov 2011 08:33:11 +0000 (-0500)
Subject: Merge branch 'maint-0.2.2' into release-0.2.2
X-Git-Tag: tor-0.2.2.35~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57db578b814ec0c036048135943da9942b72953d;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2' into release-0.2.2
---

57db578b814ec0c036048135943da9942b72953d