aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2010-11-23 00:06:43 -0500
committerRoger Dingledine <arma@torproject.org>2010-11-23 00:06:43 -0500
commitd05323c8026c12cd5fc084f791360314bd9fadf7 (patch)
treec8f67b0fe970828a6f7af088874f147b0caefc71
parent076d2a0e117f4174ac903a73b53656fbfee5a16f (diff)
downloadtor-d05323c8026c12cd5fc084f791360314bd9fadf7.tar.gz
tor-d05323c8026c12cd5fc084f791360314bd9fadf7.zip
fold in changelog
-rw-r--r--ChangeLog3
-rw-r--r--changes/remove-website5
2 files changed, 3 insertions, 5 deletions
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.
-