From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 27 Aug 2012 20:21:10 +0000 (-0400)
Subject: Merge (with -s ours) remote-tracking branch 'origin/maint-0.2.3'
X-Git-Tag: tor-0.2.4.1-alpha~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2776a6b8103e745a9be8fc181a2b10273289a5e1;p=thirdparty%2Ftor.git

Merge (with -s ours) remote-tracking branch 'origin/maint-0.2.3'

We are doing this merge to avoid taking the patch from
"nickm/disable_pathbias_warnings_v2" into 0.2.4 -- we're going to try
to fix the pathbias code for real here.
---

2776a6b8103e745a9be8fc181a2b10273289a5e1