From: Roger Dingledine <arma@torproject.org>
Date: Sat, 10 Aug 2013 22:30:20 +0000 (-0400)
Subject: Merge branch 'maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~74
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49fd76be05cf5d0fcf5b766e87ac8a9e2207224f;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.4'
---

49fd76be05cf5d0fcf5b766e87ac8a9e2207224f