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
This commit is contained in:
Nick Mathewson
2010-08-04 12:37:30 -04:00
31 changed files with 5 additions and 3854 deletions
+5
View File
@@ -0,0 +1,5 @@
o Removed files:
- Remove the old debian/ directory from the main Tor distribution.
The official Tor-for-debian git repository lives at the URL
https://git.torproject.org/debian/tor.git .