From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 16 May 2011 20:40:57 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
X-Git-Tag: tor-0.2.2.26-beta~9^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=952ae0ea69214636a426b71581661cf0eb0aaa12;p=thirdparty%2Ftor.git

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

Conflicts:
	changes/bug2190
	changes/forget-rend-descs-on-newnym
---

952ae0ea69214636a426b71581661cf0eb0aaa12