From: Roger Dingledine <arma@torproject.org>
Date: Wed, 5 Sep 2012 20:41:43 +0000 (-0400)
Subject: Merge branch 'maint-0.2.3'
X-Git-Tag: tor-0.2.4.1-alpha~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f82ae44cb85e61a729ccb7ce47451dae97e8602;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.3'
---

6f82ae44cb85e61a729ccb7ce47451dae97e8602