From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 29 Oct 2011 13:22:58 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.7-alpha~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6be596e2dc04a736221b573f73a6324352f8538a;p=thirdparty%2Ftor.git

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

Conflicts:
	src/or/config.c
---

6be596e2dc04a736221b573f73a6324352f8538a