From: Roger Dingledine <arma@torproject.org>
Date: Wed, 18 May 2011 01:15:24 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~107
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18f1b354ece34947e9a17b5cefb33cfbd73641e7;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

18f1b354ece34947e9a17b5cefb33cfbd73641e7