From: Roger Dingledine <arma@torproject.org>
Date: Fri, 11 Oct 2013 01:25:01 +0000 (-0400)
Subject: Merge branch 'maint-0.2.4'
X-Git-Tag: tor-0.2.5.2-alpha~134
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78251e004f03eca93dfbdae2a2b6c18bff948bf2;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.4'
---

78251e004f03eca93dfbdae2a2b6c18bff948bf2