From: Roger Dingledine <arma@torproject.org>
Date: Fri, 6 Jul 2012 12:59:26 +0000 (-0400)
Subject: Merge branch 'maint-0.2.3'
X-Git-Tag: tor-0.2.4.1-alpha~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fee920999bb51e2831b03faff7dabbcf20355e7;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.3'
---

1fee920999bb51e2831b03faff7dabbcf20355e7