summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-08-04 12:37:30 -0400
committerNick Mathewson <nickm@torproject.org>2010-08-04 12:37:30 -0400
commitde7ed2fd7a094de440bc00867a5afa8e0dde7936 (patch)
tree31126ce80881808b379f203f863286dd0a755649 /changes
parentcafd868a7898a0aac7eaf58f76a8e1180766d3a8 (diff)
parente7d2a9b6c4407217780be3a0d0cbb29fd3812cf5 (diff)
downloadtor-de7ed2fd7a094de440bc00867a5afa8e0dde7936.tar.gz
tor-de7ed2fd7a094de440bc00867a5afa8e0dde7936.zip
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
Diffstat (limited to 'changes')
-rw-r--r--changes/remove-debian5
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/remove-debian b/changes/remove-debian
new file mode 100644
index 0000000000..6eb1896bae
--- /dev/null
+++ b/changes/remove-debian
@@ -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 .
+