From: Roger Dingledine <arma@torproject.org>
Date: Sun, 11 Nov 2007 01:06:16 +0000 (+0000)
Subject: Allow people to say PreferTunnelledDirConns rather than
X-Git-Tag: tor-0.2.0.11-alpha~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ca51869fdcd653406dd908d1661a25315393bf9;p=thirdparty%2Ftor.git

Allow people to say PreferTunnelledDirConns rather than
PreferTunneledDirConns, for those alternate-spellers out there.


svn:r12466
---

diff --git a/ChangeLog b/ChangeLog
index 238fc5e5d0..509a968235 100644
--- 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 9a54ee765f..eec4ca4d0a 100644
--- 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. */