From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 20 Mar 2014 17:55:55 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.3-alpha~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2fae74d6c3e84eef24d628f55898c27a2ffa23f7;p=thirdparty%2Ftor.git

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

This is an "ours" merge, taking nothing, since we already had the
changes that were in a83abcf5ee5cb8fe245bc97e0
---

2fae74d6c3e84eef24d628f55898c27a2ffa23f7