From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 26 Mar 2012 17:57:51 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.13-alpha~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f3ec43e5b4ee3aed0c69ee5b1d11b170f8eb88a;p=thirdparty%2Ftor.git

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

Conflicts:
	changes/bug5090

bug5090 was already merged and corrected in the master branch's changelog.
---

2f3ec43e5b4ee3aed0c69ee5b1d11b170f8eb88a