elevate a changelog entry, and get my mailto out of the man page

diff --git a/ChangeLog b/ChangeLog
index 4fe3bc729194a45763840038f329e8fd6bec5c7b..dc4cfe86c649b0a954590aa1d5c43166481516ca 100644 (file)
--- 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 3f906e82bbeea72a286d9bd2decf4dd667a4030a..04b764ad6d9277aec27c932f4999925a01fc22fa 100644 (file)
--- 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@freehaven.net if you think you should be a directory.
+    tor-ops@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@mit.edu[arma@mit.edu]>, Nick Mathewson <mailto:nickm@alum.mit.edu[nickm@alum.mit.edu]>.
+Roger Dingledine [arma at mit.edu], Nick Mathewson [nickm at alum.mit.edu].