From: Roger Dingledine <arma@torproject.org>
Date: Wed, 1 Dec 2010 05:11:27 +0000 (-0500)
Subject: Merge branch 'maint-0.2.1' into maint-0.2.2
X-Git-Tag: tor-0.2.2.20-alpha~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b259c08318c94e6e75cc999f6d5dd864e7e08c1b;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.1' into maint-0.2.2

Conflicts:

	doc/Makefile.am
---

b259c08318c94e6e75cc999f6d5dd864e7e08c1b