diff --git a/doc/tor.1.in b/doc/tor.1.in
index 18e6dfd871..35fc8ec1f5 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -26,6 +26,30 @@ Display a short help message and exit.
 FILE contains further "option value" pairs. (Default: @CONFDIR@/torrc)
 .LP
 .TP
+\fB--hash-password\fP
+Generates a hashed password for control port access.
+.LP
+.TP
+\fB--list-fingerprint\fP
+Generate your keys and output your nickname and fingerprint.
+.LP
+.TP
+\fB--verify-config\fP
+Verify the configuration file is valid.
+.LP
+.TP
+\fB--nt-servce\fP
+Create a service of Tor under Win32 operating systems.
+.LP
+.TP
+\fB--list-torrc-options\fP
+List all valid options.
+.LP
+.TP
+\fB--version\fP
+Display Tor version.
+.LP
+.TP
 Other options can be specified either on the command-line (\fI--option
 value\fR), or in the configuration file (\fIoption value\fR).
 Options are case-insensitive.
diff --git a/src/or/config.c b/src/or/config.c
index 70b981bd76..32b707ed59 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
- * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
+ * Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 const char config_c_id[] = \