From: Roger Dingledine <arma@torproject.org>
Date: Mon, 11 Mar 2013 03:42:14 +0000 (-0400)
Subject: Merge branch 'maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~279
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=331e4dcb460b5c91c1760af134f1a1c1f36b871b;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.4'
---

331e4dcb460b5c91c1760af134f1a1c1f36b871b