From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 4 Aug 2010 16:37:30 +0000 (-0400)
Subject: Merge commit 'origin/maint-0.2.1'
X-Git-Tag: tor-0.2.2.15-alpha~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de7ed2fd7a094de440bc00867a5afa8e0dde7936;p=thirdparty%2Ftor.git

Merge commit 'origin/maint-0.2.1'

Conflicts:
	debian/changelog
	debian/control
	debian/patches/03_tor_manpage_in_section_8.dpatch
	debian/patches/06_add_compile_time_defaults.dpatch
	debian/rules
---

de7ed2fd7a094de440bc00867a5afa8e0dde7936