From: Roger Dingledine <arma@torproject.org>
Date: Thu, 5 Jan 2012 11:46:01 +0000 (-0500)
Subject: Merge branch 'maint-0.2.2' into release-0.2.2
X-Git-Tag: tor-0.2.2.36~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98402d0865b70fc9b920c21f196b5f1b3a499938;p=thirdparty%2Ftor.git

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

98402d0865b70fc9b920c21f196b5f1b3a499938