From: Roger Dingledine <arma@torproject.org>
Date: Sat, 12 Oct 2013 14:48:30 +0000 (-0400)
Subject: Merge branch 'maint-0.2.4'
X-Git-Tag: tor-0.2.5.2-alpha~125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a26a5794a308ce30c5d2cf8d16e57903cbf9c8fb;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.4'
---

a26a5794a308ce30c5d2cf8d16e57903cbf9c8fb