From: Roger Dingledine <arma@torproject.org>
Date: Wed, 13 Jun 2012 07:48:43 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.17-beta~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=068046eebc73fbe1f0d8419f0dfea65d3de9c14a;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

068046eebc73fbe1f0d8419f0dfea65d3de9c14a