From: Roger Dingledine <arma@torproject.org>
Date: Tue, 25 Oct 2011 23:34:42 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.6-alpha~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a518dd66506e44c1318c44777187dc82c275329e;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

a518dd66506e44c1318c44777187dc82c275329e