diff --git a/ChangeLog b/ChangeLog
index 584e2f1bf7..87d410d44f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,12 @@ Changes in version 0.2.1.10-alpha - 2009-01-??
       automatically give up after the 254th failure.  Bugfix on
       0.2.1.9-alpha.
 
+  o Deprecated and removed features:
+    - The old "tor --version --version" command, which would spit out the
+      subversion "Id" of most of the source files, is now removed.  It
+      turned out to be less useful than we'd expected, and harder to
+      maintain.
+
   o Code simplifications and refactoring:
     - Change our header file guard macros to be less likely to conflict
       with system headers.  Adam Langley noticed that we were conflicting
diff --git a/src/common/address.c b/src/common/address.c
index 2dd763da99..7b122e3f24 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -2,9 +2,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char address_c_id[] =
-  "$Id$";
 
 /**
  * \file address.c
diff --git a/src/common/address.h b/src/common/address.h
index 76b7947544..521a360fa1 100644
--- a/src/common/address.h
+++ b/src/common/address.h
@@ -2,7 +2,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
 
 /**
  * \file address.h
@@ -11,7 +10,6 @@
 
 #ifndef _TOR_ADDRESS_H
 #define _TOR_ADDRESS_H
-#define ADDRESS_H_ID "$Id$"
 
 #include "orconfig.h"
 #include "torint.h"
diff --git a/src/common/aes.c b/src/common/aes.c
index 52b28b24ae..60df36ecdd 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -3,8 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char aes_c_id[] = "$Id$";
 
 /**
  * \file aes.c
diff --git a/src/common/aes.h b/src/common/aes.h
index ad9b78b233..a566fb4b70 100644
--- a/src/common/aes.h
+++ b/src/common/aes.h
@@ -2,13 +2,11 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
 
 /* Implements a minimal interface to counter-mode AES. */
 
 #ifndef _TOR_AES_H
 #define _TOR_AES_H
-#define AES_H_ID "$Id$"
 
 /**
  * \file aes.h
diff --git a/src/common/compat.c b/src/common/compat.c
index 188c2a84fe..c54342e56f 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -2,9 +2,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char compat_c_id[] =
-  "$Id$";
 
 /**
  * \file compat.c
diff --git a/src/common/compat.h b/src/common/compat.h
index 6dd2f99f2a..d1a7b3d944 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -2,11 +2,9 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
 
 #ifndef _TOR_COMPAT_H
 #define _TOR_COMPAT_H
-#define COMPAT_H_ID "$Id$"
 
 #include "orconfig.h"
 #include "torint.h"
diff --git a/src/common/container.c b/src/common/container.c
index 5e1bc63a6b..5c54e469bd 100644
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -2,9 +2,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char container_c_id[] =
-  "$Id$";
 
 /**
  * \file container.c
diff --git a/src/common/container.h b/src/common/container.h
index 57c5c2c716..b4ec4ee246 100644
--- a/src/common/container.h
+++ b/src/common/container.h
@@ -2,12 +2,9 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
 
 #ifndef _TOR_CONTAINER_H
 #define _TOR_CONTAINER_H
-#define CONTAINER_H_ID \
-  "$Id$"
 
 #include "util.h"
 
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 2c892fbc1e..ab6670039d 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -3,9 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char crypto_c_id[] =
-  "$Id$";
 
 /**
  * \file crypto.c
diff --git a/src/common/crypto.h b/src/common/crypto.h
index e1c14c1c21..906098e06f 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -3,7 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
 
 /**
  * \file crypto.h
@@ -13,7 +12,6 @@
 
 #ifndef _TOR_CRYPTO_H
 #define _TOR_CRYPTO_H
-#define CRYPTO_H_ID "$Id$"
 
 #include <stdio.h>
 #include "torint.h"
diff --git a/src/common/ht.h b/src/common/ht.h
index ab371ec36d..53c06d890e 100644
--- a/src/common/ht.h
+++ b/src/common/ht.h
@@ -1,13 +1,11 @@
 /* Copyright 2002 Christopher Clark */
 /* Copyright 2005 Nick Mathewson */
 /* See license at end. */
-/* $Id$ */
 
 /* Based on ideas by Christopher Clark and interfaces from Niels Provos. */
 
 #ifndef _TOR_HT_H
 #define _TOR_HT_H
-#define HT_H_ID "$Id$"
 
 #define HT_HEAD(name, type)                                             \
   struct name {                                                         \
diff --git a/src/common/log.c b/src/common/log.c
index 78d439130c..adab467976 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -3,8 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char log_c_id[] = "$Id$";
 
 /**
  * \file log.c
diff --git a/src/common/log.h b/src/common/log.h
index aa1e873050..66f5ee39bf 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -3,7 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
 
 /**
  * \file log.h
@@ -12,7 +11,6 @@
  **/
 
 #ifndef _TOR_LOG_H
-#define LOG_H_ID "$Id$"
 
 #include "compat.h"
 
diff --git a/src/common/memarea.c b/src/common/memarea.c
index 93b9d4f921..b99ced1351 100644
--- a/src/common/memarea.c
+++ b/src/common/memarea.c
@@ -1,6 +1,5 @@
 /* Copyright (c) 2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
 
 /** \file memarea.c
  * \brief Implementation for memarea_t, an allocator for allocating lots of
diff --git a/src/common/memarea.h b/src/common/memarea.h
index b6507728eb..2e3c884802 100644
--- a/src/common/memarea.h
+++ b/src/common/memarea.h
@@ -1,6 +1,5 @@
 /* Copyright (c) 2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
 /* Tor dependencies */
 
 #ifndef _TOR_MEMAREA_H
diff --git a/src/common/mempool.c b/src/common/mempool.c
index 6f3edbd6d8..3825957e7d 100644
--- a/src/common/mempool.c
+++ b/src/common/mempool.c
@@ -1,6 +1,5 @@
 /* Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
 #if 1
 /* Tor dependencies */
 #include "orconfig.h"
diff --git a/src/common/mempool.h b/src/common/mempool.h
index 584f0ae068..ca8cc1432f 100644
--- a/src/common/mempool.h
+++ b/src/common/mempool.h
@@ -1,6 +1,5 @@
 /* Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
 
 /**
  * \file mempool.h
diff --git a/src/common/strlcpy.c b/src/common/strlcpy.c
index 142135aa3b..9fc47903a1 100644
--- a/src/common/strlcpy.c
+++ b/src/common/strlcpy.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*	$OpenBSD: strlcpy.c,v 1.2 1998/11/06 04:33:16 wvdputte Exp $	*/
 
 /*
diff --git a/src/common/test.h b/src/common/test.h
index 6d4d9e47b6..05e17e3fc5 100644
--- a/src/common/test.h
+++ b/src/common/test.h
@@ -2,11 +2,9 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
 
 #ifndef _TOR_TEST_H
 #define _TOR_TEST_H
-#define TEST_H_ID "$Id$"
 
 /**
  * \file test.h
diff --git a/src/common/torgzip.c b/src/common/torgzip.c
index d1289443e2..0347d59eb4 100644
--- a/src/common/torgzip.c
+++ b/src/common/torgzip.c
@@ -2,9 +2,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char torgzip_c_id[] =
-  "$Id$";
 
 /**
  * \file torgzip.c
diff --git a/src/common/torgzip.h b/src/common/torgzip.h
index 1172371801..6b994c2fc4 100644
--- a/src/common/torgzip.h
+++ b/src/common/torgzip.h
@@ -2,7 +2,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
 
 /**
  * \file torgzip.h
@@ -11,7 +10,6 @@
 
 #ifndef _TOR_TORGZIP_H
 #define _TOR_TORGZIP_H
-#define TORGZIP_H_ID "$Id$"
 
 /** Enumeration of what kind of compression to use.  Only ZLIB_METHOD is
  * guaranteed to be supported by the compress/uncompress functions here;
diff --git a/src/common/torint.h b/src/common/torint.h
index b36acc8d11..e603aa5fa4 100644
--- a/src/common/torint.h
+++ b/src/common/torint.h
@@ -2,7 +2,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
 
 /**
  * \file torint.h
@@ -11,7 +10,6 @@
 
 #ifndef _TOR_TORINT_H
 #define _TOR_TORINT_H
-#define TORINT_H_ID "$Id$"
 
 #include "orconfig.h"
 
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 20c1d06761..288b757b04 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -2,9 +2,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char tortls_c_id[] =
-  "$Id$";
 
 /**
  * \file tortls.c
diff --git a/src/common/tortls.h b/src/common/tortls.h
index c20fccbb02..37e762ed3a 100644
--- a/src/common/tortls.h
+++ b/src/common/tortls.h
@@ -2,11 +2,9 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
 
 #ifndef _TOR_TORTLS_H
 #define _TOR_TORTLS_H
-#define TORTLS_H_ID "$Id$"
 
 /**
  * \file tortls.h
diff --git a/src/common/util.c b/src/common/util.c
index 4a8d762e4f..7dc8bcfb9e 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -2,8 +2,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char util_c_id[] = "$Id$";
 
 /**
  * \file util.c
diff --git a/src/common/util.h b/src/common/util.h
index d3e234185c..93db417f11 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -2,7 +2,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
 
 /**
  * \file util.h
@@ -11,7 +10,6 @@
 
 #ifndef _TOR_UTIL_H
 #define _TOR_UTIL_H
-#define UTIL_H_ID "$Id$"
 
 #include "orconfig.h"
 #include "torint.h"
diff --git a/src/or/buffers.c b/src/or/buffers.c
index ed819789e4..6b8ac09918 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -3,9 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char buffers_c_id[] =
-  "$Id$";
 
 /**
  * \file buffers.c
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index e9b89f0863..f6ffd2efdf 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -3,9 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char circuitbuild_c_id[] =
-  "$Id$";
 
 /**
  * \file circuitbuild.c
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index c807aaa457..224443e55d 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -3,9 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char circuitlist_c_id[] =
-  "$Id$";
 
 /**
  * \file circuitlist.c
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index e1b6502c4a..e6feb2250d 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -3,9 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char circuituse_c_id[] =
-  "$Id$";
 
 /**
  * \file circuituse.c
diff --git a/src/or/command.c b/src/or/command.c
index 7ad20f0098..96e18395c0 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -3,9 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char command_c_id[] =
-  "$Id$";
 
 /**
  * \file command.c
diff --git a/src/or/config.c b/src/or/config.c
index 46e0392582..331a044d97 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3,9 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char config_c_id[] = \
-  "$Id$";
 
 /**
  * \file config.c
@@ -698,7 +695,6 @@ static int options_init_logs(or_options_t *options, int validate_only);
 
 static uint64_t config_parse_memunit(const char *s, int *ok);
 static int config_parse_interval(const char *s, int *ok);
-static void print_svn_version(void);
 static void init_libevent(void);
 static int opt_streq(const char *s1, const char *s2);
 /** Versions of libevent. */
@@ -3926,9 +3922,6 @@ options_init_from_torrc(int argc, char **argv)
 
   if (argc > 1 && (!strcmp(argv[1],"--version"))) {
     printf("Tor version %s.\n",get_version());
-    if (argc > 2 && (!strcmp(argv[2],"--version"))) {
-      print_svn_version();
-    }
     exit(0);
   }
 
@@ -5229,107 +5222,3 @@ getinfo_helper_config(control_connection_t *conn,
   return 0;
 }
 
-#include "aes.h"
-#include "ht.h"
-#include "test.h"
-
-extern const char address_c_id[];
-extern const char aes_c_id[];
-extern const char compat_c_id[];
-extern const char container_c_id[];
-extern const char crypto_c_id[];
-extern const char log_c_id[];
-extern const char torgzip_c_id[];
-extern const char tortls_c_id[];
-extern const char util_c_id[];
-
-extern const char buffers_c_id[];
-extern const char circuitbuild_c_id[];
-extern const char circuitlist_c_id[];
-extern const char circuituse_c_id[];
-extern const char command_c_id[];
-//  extern const char config_c_id[];
-extern const char connection_c_id[];
-extern const char connection_edge_c_id[];
-extern const char connection_or_c_id[];
-extern const char control_c_id[];
-extern const char cpuworker_c_id[];
-extern const char directory_c_id[];
-extern const char dirserv_c_id[];
-extern const char dns_c_id[];
-extern const char hibernate_c_id[];
-extern const char main_c_id[];
-#ifdef NT_SERVICE
-extern const char ntmain_c_id[];
-#endif
-extern const char onion_c_id[];
-extern const char policies_c_id[];
-extern const char relay_c_id[];
-extern const char rendclient_c_id[];
-extern const char rendcommon_c_id[];
-extern const char rendmid_c_id[];
-extern const char rendservice_c_id[];
-extern const char rephist_c_id[];
-extern const char router_c_id[];
-extern const char routerlist_c_id[];
-extern const char routerparse_c_id[];
-
-/** Dump the version of every file to the log. */
-static void
-print_svn_version(void)
-{
-  puts(ADDRESS_H_ID);
-  puts(AES_H_ID);
-  puts(COMPAT_H_ID);
-  puts(CONTAINER_H_ID);
-  puts(CRYPTO_H_ID);
-  puts(HT_H_ID);
-  puts(TEST_H_ID);
-  puts(LOG_H_ID);
-  puts(TORGZIP_H_ID);
-  puts(TORINT_H_ID);
-  puts(TORTLS_H_ID);
-  puts(UTIL_H_ID);
-  puts(address_c_id);
-  puts(aes_c_id);
-  puts(compat_c_id);
-  puts(container_c_id);
-  puts(crypto_c_id);
-  puts(log_c_id);
-  puts(torgzip_c_id);
-  puts(tortls_c_id);
-  puts(util_c_id);
-
-  puts(OR_H_ID);
-  puts(buffers_c_id);
-  puts(circuitbuild_c_id);
-  puts(circuitlist_c_id);
-  puts(circuituse_c_id);
-  puts(command_c_id);
-  puts(config_c_id);
-  puts(connection_c_id);
-  puts(connection_edge_c_id);
-  puts(connection_or_c_id);
-  puts(control_c_id);
-  puts(cpuworker_c_id);
-  puts(directory_c_id);
-  puts(dirserv_c_id);
-  puts(dns_c_id);
-  puts(hibernate_c_id);
-  puts(main_c_id);
-#ifdef NT_SERVICE
-  puts(ntmain_c_id);
-#endif
-  puts(onion_c_id);
-  puts(policies_c_id);
-  puts(relay_c_id);
-  puts(rendclient_c_id);
-  puts(rendcommon_c_id);
-  puts(rendmid_c_id);
-  puts(rendservice_c_id);
-  puts(rephist_c_id);
-  puts(router_c_id);
-  puts(routerlist_c_id);
-  puts(routerparse_c_id);
-}
-
diff --git a/src/or/connection.c b/src/or/connection.c
index 2587e28f96..56b31ad8e1 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -3,9 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char connection_c_id[] =
-  "$Id$";
 
 /**
  * \file connection.c
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index e50f838a98..330275a964 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -3,9 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char connection_edge_c_id[] =
-  "$Id$";
 
 /**
  * \file connection_edge.c
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index bfd3a71b81..25dfc9b831 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -3,9 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char connection_or_c_id[] =
-  "$Id$";
 
 /**
  * \file connection_or.c
diff --git a/src/or/control.c b/src/or/control.c
index c57cdd0496..7e8cbfcf6b 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1,9 +1,6 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char control_c_id[] =
-  "$Id$";
 
 /**
  * \file control.c
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c
index c6c68c07f5..b0d3d1c4c0 100644
--- a/src/or/cpuworker.c
+++ b/src/or/cpuworker.c
@@ -2,9 +2,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char cpuworker_c_id[] =
-  "$Id$";
 
 /**
  * \file cpuworker.c
diff --git a/src/or/directory.c b/src/or/directory.c
index 786b9be7c1..8e46db3fe3 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2,9 +2,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char directory_c_id[] =
-  "$Id$";
 
 #include "or.h"
 #if defined(EXPORTMALLINFO) && defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 85bbee4ee1..4f8ad01ea4 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -2,9 +2,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char dirserv_c_id[] =
-  "$Id$";
 
 #define DIRSERV_PRIVATE
 #include "or.h"
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index b276b11fca..3db1954a88 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2,9 +2,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char dirvote_c_id[] =
-  "$Id$";
 
 #define DIRVOTE_PRIVATE
 #include "or.h"
diff --git a/src/or/dns.c b/src/or/dns.c
index 7f60c651f3..3266cf99dc 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -2,9 +2,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char dns_c_id[] =
-  "$Id$";
 
 /**
  * \file dns.c
diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index ff8d76e3b3..11002e9d7f 100644
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -1,8 +1,5 @@
 /* Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char dnsserv_c_id[] =
-  "$Id$";
 
 /**
  * \file dnsserv.c \brief Implements client-side DNS proxy server code.  Note:
diff --git a/src/or/eventdns.c b/src/or/eventdns.c
index 6b61758210..60f08265cd 100644
--- a/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* The original version of this module was written by Adam Langley; for
  * a history of modifications, check out the subversion logs.
  *
diff --git a/src/or/geoip.c b/src/or/geoip.c
index 3dbfab1869..75902d55ac 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -1,8 +1,5 @@
 /* Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id: /tor/trunk/src/or/networkstatus.c 15493 2007-12-16T18:33:25.055570Z nickm  $ */
-const char geoip_c_id[] =
-  "$Id: /tor/trunk/src/or/networkstatus.c 15493 2007-12-16T18:33:25.055570Z nickm  $";
 
 /**
  * \file geoip.c
diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index 4195fed654..c0a750308e 100644
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -1,9 +1,6 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char hibernate_c_id[] =
-  "$Id$";
 
 /**
  * \file hibernate.c
diff --git a/src/or/main.c b/src/or/main.c
index 2f518876bb..d1c2b516ff 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -3,9 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char main_c_id[] =
-  "$Id$";
 
 /**
  * \file main.c
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index d7fc8dc903..e942567403 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -3,9 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char networkstatus_c_id[] =
-  "$Id$";
 
 /**
  * \file networkstatus.c
diff --git a/src/or/ntmain.c b/src/or/ntmain.c
index efc2a6069c..385e1066a9 100644
--- a/src/or/ntmain.c
+++ b/src/or/ntmain.c
@@ -2,14 +2,10 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
 
 #define MAIN_PRIVATE
 #include "or.h"
 
-const char ntmain_c_id[] =
-  "$Id$";
-
 #include <tchar.h>
 #define GENSRV_SERVICENAME  TEXT("tor")
 #define GENSRV_DISPLAYNAME  TEXT("Tor Win32 Service")
diff --git a/src/or/onion.c b/src/or/onion.c
index b73e174298..92dc12b988 100644
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -3,9 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char onion_c_id[] =
-  "$Id$";
 
 /**
  * \file onion.c
diff --git a/src/or/or.h b/src/or/or.h
index 19b6bc7c9f..2d6fb3e0ef 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3,7 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
 
 /**
  * \file or.h
@@ -12,7 +11,6 @@
 
 #ifndef _TOR_OR_H
 #define _TOR_OR_H
-#define OR_H_ID "$Id$"
 
 #include "orconfig.h"
 
diff --git a/src/or/policies.c b/src/or/policies.c
index 5ffff279cb..8ef8cdb690 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -2,9 +2,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char policies_c_id[] = \
-  "$Id$";
 
 /**
  * \file policies.c
diff --git a/src/or/reasons.c b/src/or/reasons.c
index dd989950b4..c427a8dc74 100644
--- a/src/or/reasons.c
+++ b/src/or/reasons.c
@@ -1,9 +1,6 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char reasons_c_id[] =
-  "$Id$";
 
 /**
  * \file reasons.c
diff --git a/src/or/relay.c b/src/or/relay.c
index 48a10b9af6..bc1b2a50ed 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -3,9 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char relay_c_id[] =
-  "$Id$";
 
 /**
  * \file relay.c
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 0c091d4d40..4affe55ab1 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -1,9 +1,6 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char rendclient_c_id[] =
-  "$Id$";
 
 /**
  * \file rendclient.c
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index f81cfed6a1..1de0dd67ba 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -1,9 +1,6 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char rendcommon_c_id[] =
-  "$Id$";
 
 /**
  * \file rendcommon.c
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index aa97453a1e..7f64fecbc0 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -1,9 +1,6 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char rendmid_c_id[] =
-  "$Id$";
 
 /**
  * \file rendmid.c
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index efc8b4571e..a30dbc69a5 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1,9 +1,6 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char rendservice_c_id[] =
-  "$Id$";
 
 /**
  * \file rendservice.c
diff --git a/src/or/rephist.c b/src/or/rephist.c
index 939a3d22ba..38dbcf7824 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -1,9 +1,6 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char rephist_c_id[] =
-  "$Id$";
 
 /**
  * \file rephist.c
diff --git a/src/or/router.c b/src/or/router.c
index 55618c4eb1..7ed4af17d9 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -3,9 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char router_c_id[] =
-  "$Id$";
 
 #define ROUTER_PRIVATE
 
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index ddb488df49..305c1debc7 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3,9 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char routerlist_c_id[] =
-  "$Id$";
 
 /**
  * \file routerlist.c
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index d90a83544a..cef7f73bee 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -3,9 +3,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char routerparse_c_id[] =
-  "$Id$";
 
 /**
  * \file routerparse.c
diff --git a/src/or/test.c b/src/or/test.c
index 4ca72633aa..e3f92f6d4f 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -2,9 +2,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char test_c_id[] =
-  "$Id$";
 
 /* Ordinarily defined in tor_main.c; this bit is just here to provide one
  * since we're not linking to tor_main.c */
diff --git a/src/or/test_data.c b/src/or/test_data.c
index cb8958a664..61fa37af44 100644
--- a/src/or/test_data.c
+++ b/src/or/test_data.c
@@ -2,9 +2,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id: /tor/trunk/src/or/test.c 13338 2007-06-10T19:13:32.101740Z nickm  $ */
-const char test_data_c_id[] =
-  "$Id: /tor/trunk/src/or/test.c 13338 2007-06-10T19:13:32.101740Z nickm  $";
 
 /** First of 3 example authority certificates for unit testing. */
 const char AUTHORITY_CERT_1[] =
diff --git a/src/or/tor_main.c b/src/or/tor_main.c
index 4f06f3fa90..5890c9aa9c 100644
--- a/src/or/tor_main.c
+++ b/src/or/tor_main.c
@@ -2,9 +2,6 @@
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
  * Copyright (c) 2007-2008, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id$ */
-const char tor_main_c_id[] =
-  "$Id$";
 
 /** String describing which Tor subversion repository version the source was
  * built from.  This string is generated by a bit of shell kludging int
diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c
index 52145e512c..cbb8826e48 100644
--- a/src/tools/tor-gencert.c
+++ b/src/tools/tor-gencert.c
@@ -1,6 +1,5 @@
 /* Copyright (c) 2007-2008 The Tor Project, Inc. */
 /* See LICENSE for licensing information */
-/* $Id: /tor/trunk/src/tools/tor-resolve.c 12481 2007-04-21T17:27:19.371353Z nickm  $ */
 
 #include "orconfig.h"
 
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index 50ab28e1cd..100c8107a4 100644
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -2,7 +2,6 @@
  * Copyright (c) 2007-2008, The Tor Project, Inc.
  */
 /* See LICENSE for licensing information */
-/* $Id$ */
 
 #include "orconfig.h"
 
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 29bce8a74a..a16c70330f 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -1,4 +1,3 @@
-/* $Id */
 /* orconfig.h for Windows -- This file is *not* generated by autoconf.
  * Instead, it has to be hand-edited to keep Win32 happy.
  */