From: Roger Dingledine <arma@torproject.org>
Date: Sat, 21 Sep 2013 06:21:15 +0000 (-0400)
Subject: Merge branch 'maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99703c9b31375933eede574e1718582743e67d38;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.4'
---

99703c9b31375933eede574e1718582743e67d38