From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 22 Feb 2011 22:20:55 +0000 (-0500)
Subject: Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
X-Git-Tag: tor-0.2.3.1-alpha~110^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06deec15c9ecb7c40e3f7f8e05be887ab0705877;p=thirdparty%2Ftor.git

Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

(This is an "ours" merge of the code for bug1859 backported to 0.2.1.)
---

06deec15c9ecb7c40e3f7f8e05be887ab0705877