From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 24 Oct 2012 01:50:43 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.3'
X-Git-Tag: tor-0.2.4.5-alpha~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9064238495151915699fa50c437722f236b877fc;p=thirdparty%2Ftor.git

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

This is an "ours" merge; we want a separate fix for this bug (bug7191)
in master. Rather than catching the two failing cases, we need to make
them not fail.
---

9064238495151915699fa50c437722f236b877fc