[or-cvs] r12466: Allow people to say PreferTunnelledDirConns rather than Pref (in tor/trunk: . src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2007-11-10 20:06:16 -0500 (Sat, 10 Nov 2007)
New Revision: 12466

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/config.c
Log:
Allow people to say PreferTunnelledDirConns rather than
PreferTunneledDirConns, for those alternate-spellers out there.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-11-11 00:33:53 UTC (rev 12465)
+++ tor/trunk/ChangeLog	2007-11-11 01:06:16 UTC (rev 12466)
@@ -6,6 +6,10 @@
       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.

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2007-11-11 00:33:53 UTC (rev 12465)
+++ tor/trunk/src/or/config.c	2007-11-11 01:06:16 UTC (rev 12466)
@@ -81,6 +81,7 @@
   { "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. */