From: Roger Dingledine <arma@torproject.org>
Date: Tue, 23 Oct 2012 21:26:07 +0000 (-0400)
Subject: Merge branch 'maint-0.2.3'
X-Git-Tag: tor-0.2.4.5-alpha~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c06a804d946de238e2d6a0b1a7dd655b0d82ccc;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.3'
---

4c06a804d946de238e2d6a0b1a7dd655b0d82ccc