From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 15 Feb 2014 05:03:29 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.3-alpha~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=339a47e80bcb898f96e41b9110dda07dd3a2fd05;p=thirdparty%2Ftor.git

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

339a47e80bcb898f96e41b9110dda07dd3a2fd05