From d05323c8026c12cd5fc084f791360314bd9fadf7 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Tue, 23 Nov 2010 00:06:43 -0500 Subject: [PATCH] fold in changelog --- ChangeLog | 3 +++ changes/remove-website | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 changes/remove-website diff --git a/ChangeLog b/ChangeLog index 57b23e7c8e..ced4fba0eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,9 @@ Changes in version 0.2.1.27 - 2010-11-23 - 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 + - Stop shipping the old doc/website/ directory in the tarball. We + changed the website format in late 2010, and what we shipped in + 0.2.1.26 really wasn't that useful anyway. Changes in version 0.2.1.26 - 2010-05-02 diff --git a/changes/remove-website b/changes/remove-website deleted file mode 100644 index ecbfbf9bc2..0000000000 --- a/changes/remove-website +++ /dev/null @@ -1,5 +0,0 @@ - o Removed files: - - Stop shipping the old doc/website/ directory in the tarball. We - changed the website format in late 2010, and what we shipped in - 0.2.1.26 really wasn't that useful anyway. -