From: Roger Dingledine <arma@torproject.org>
Date: Fri, 18 May 2012 20:49:50 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2' into release-0.2.2
X-Git-Tag: tor-0.2.2.36~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=975dd009ec011f9c301c10f7483b661b172f9a96;p=thirdparty%2Ftor.git

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

975dd009ec011f9c301c10f7483b661b172f9a96