From: Roger Dingledine <arma@torproject.org>
Date: Sat, 29 Oct 2011 20:26:01 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2' into release-0.2.2
X-Git-Tag: tor-0.2.2.35~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da068c9166d977484222426f1d2423d7ce4e0d5f;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2' into release-0.2.2
---

da068c9166d977484222426f1d2423d7ce4e0d5f