From: Roger Dingledine <arma@torproject.org>
Date: Thu, 15 Sep 2011 20:35:26 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.5-alpha~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c0345a3d003a0a52b9334ad559698a220e8b76d;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

0c0345a3d003a0a52b9334ad559698a220e8b76d