[or-cvs] [tor/master] elevate a changelog entry, and get my mailto out of the man page

[arma at torproject.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Mon, 22 Feb 2010 16:19:35 -0500
Subject: elevate a changelog entry, and get my mailto out of the man page
Commit: 8ce1cb174d9e0801488e5d924a40318b71667d2e

---
 ChangeLog     |    6 +++---
 doc/tor.1.txt |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4fe3bc7..dc4cfe8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@ Changes in version 0.2.2.9-alpha - 2010-02-22
       that didn't allow exiting to any ports. This bug could screw
       with load balancing and stats. Bugfix on 0.1.1.6-alpha; fixes bug
       1238. Bug discovered by Martin Kowalczyk.
+    - When freeing a cipher, zero it out completely. We only zeroed
+      the first ptrsize bytes. Bugfix on tor-0.0.2pre8. Discovered
+      and patched by ekir. Fixes bug 1254.
 
   o Minor bugfixes:
     - Fix static compilation by listing the openssl libraries in the right
@@ -45,9 +48,6 @@ Changes in version 0.2.2.9-alpha - 2010-02-22
     - Fix a spec conformance issue: the network-status-version token
       must be the first token in a v3 consensus or vote. Discovered by
       parakeep. Bugfix on 0.2.0.3-alpha.
-    - When freeing a cipher, zero it out completely. We only zeroed
-      the first ptrsize bytes. Bugfix on tor-0.0.2pre8. Discovered
-      and patched by ekir. Fixes bug 1254.
 
   o Code simplifications and refactoring:
     - Generate our manpage and HTML documentation using Asciidoc. This
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 3f906e8..04b764a 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -980,7 +980,7 @@ if DirPort is non-zero):
     good servers, signs it, and sends that to the clients. Unless the clients
     already have you listed as a trusted directory, you probably do not want
     to set this option. Please coordinate with the other admins at
-    tor-ops at freehaven.net if you think you should be a directory.
+    tor-ops at torproject.org if you think you should be a directory.
 
 **DirPortFrontPage** __FILENAME__::
     When this option is set, it takes an HTML file and publishes it as "/" on
@@ -1390,5 +1390,5 @@ Plenty, probably. Tor is still in development. Please report them.
 
 AUTHORS
 -------
-Roger Dingledine <mailto:arma at mit.edu[arma at mit.edu]>, Nick Mathewson <mailto:nickm at alum.mit.edu[nickm at alum.mit.edu]>.
+Roger Dingledine [arma at mit.edu], Nick Mathewson [nickm at alum.mit.edu].
 
-- 
1.6.5