From: Roger Dingledine <arma@torproject.org>
Date: Wed, 26 Oct 2011 21:15:09 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.6-alpha~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c4e89b86703f188f45f9edfc0fd3e4bbeac3511;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

2c4e89b86703f188f45f9edfc0fd3e4bbeac3511