From: Roger Dingledine <arma@torproject.org>
Date: Mon, 10 Sep 2012 22:25:57 +0000 (-0400)
Subject: Merge branch 'maint-0.2.3'
X-Git-Tag: tor-0.2.4.2-alpha~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d85b563dbb0c57bc5731e664952ed3f8b9a8f6e8;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.3'
---

d85b563dbb0c57bc5731e664952ed3f8b9a8f6e8