From: Roger Dingledine <arma@torproject.org>
Date: Fri, 28 Oct 2011 00:52:54 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2' into release-0.2.2
X-Git-Tag: tor-0.2.2.35~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0e1ee98af44310721fa871146ea72459e02f01c;p=thirdparty%2Ftor.git

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

f0e1ee98af44310721fa871146ea72459e02f01c