From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 8 Jul 2013 15:35:48 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fab99844fc324b2c9d415b1b1c192a25cf1c4230;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.4'
---

fab99844fc324b2c9d415b1b1c192a25cf1c4230