Allow people to say PreferTunnelledDirConns rather than

PreferTunneledDirConns, for those alternate-spellers out there.

svn:r12466

diff --git a/ChangeLog b/ChangeLog
index 238fc5e5d02889142be3e47fd9cef3415797f188..509a968235c0587a55afc24985a3513909b06c1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@ Changes in version 0.2.0.11-alpha - 2007-11-??
       many relays are running nearby to services that trust them based
       on network address.
 
+  o Minor features:
+    - Allow people to say PreferTunnelledDirConns rather than
+      PreferTunneledDirConns, for those alternate-spellers out there.
+
   o Minor bugfixes:
     - We weren't actually including the src/config/fallback-consensus
       file in the tarball. Reported by phobos.

diff --git a/src/or/config.c b/src/or/config.c
index 9a54ee765f534ce2603b062e9eefc9feb67d2184..eec4ca4d0a91e7502035e883c7d7e9adbba4afa4 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -81,6 +81,7 @@ static config_abbrev_t _option_abbrevs[] = {
   { "NumEntryNodes", "NumEntryGuards", 0, 0},
   { "ResolvConf", "ServerDNSResolvConfFile", 0, 1},
   { "SearchDomains", "ServerDNSSearchDomains", 0, 1},
+  { "PreferTunnelledDirConns", "PreferTunneledDirConns", 0, 0},
   { NULL, NULL, 0, 0},
 };
 /* A list of state-file abbreviations, for compatibility. */