From: Roger Dingledine <arma@torproject.org>
Date: Thu, 10 May 2012 21:57:31 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.16-alpha~83
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=648db9a4b7101d54f38aee60f42546e9a172e17e;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

648db9a4b7101d54f38aee60f42546e9a172e17e