Actually put ExtORPortCookieAuthFile into config.c

Fixes bug 11635; bugfix on 0.2.5.1-alpha.

diff --git a/changes/bug11635 b/changes/bug11635
new file mode 100644 (file)
index 0000000..bb5ecee
--- /dev/null
+++ b/changes/bug11635
@@ -0,0 +1,6 @@
+  o Minor bugfixes (pluggable transports):
+    - Enable the ExtORPortCookieAuthFile option, to allow changing the
+      default location of the authentication token for the extended OR Port
+      as used by sever-side pluggable transports. We had implemented this
+      option before, but the code to make it settable had been omitted.
+      Fixes bug 11635; bugfix on 0.2.5.1-alpha.

diff --git a/src/or/config.c b/src/or/config.c
index 3954c582effc585b3d320bdb40b1b9c369babd6c..b8aa7d3695f73cdcc6a197f2a64a43e6f1cfba44 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -237,6 +237,7 @@ static config_var_t option_vars_[] = {
   V(ExitPortStatistics,          BOOL,     "0"),
   V(ExtendAllowPrivateAddresses, BOOL,     "0"),
   VPORT(ExtORPort,               LINELIST, NULL),
+  V(ExtORPortCookieAuthFile,     STRING,   NULL),
   V(ExtraInfoStatistics,         BOOL,     "1"),
   V(FallbackDir,                 LINELIST, NULL),