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

Merge branch 'maint-0.2.3'
---

6cad84503bcd58f2cbe6767a3363d398d46bf224