diff options
author | Nick Mathewson <nickm@torproject.org> | 2014-04-28 12:23:18 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2014-04-28 12:23:18 -0400 |
commit | 4b519de5f9955cabc363b7217f869cdac5e2f757 (patch) | |
tree | ce5784a0c26f1bfe45cf5721f91e1103cb33027b | |
parent | 1340bd527abafc05e15ce74752e5707cd8a8bc46 (diff) | |
download | tor-4b519de5f9955cabc363b7217f869cdac5e2f757.tar tor-4b519de5f9955cabc363b7217f869cdac5e2f757.tar.gz |
Actually put ExtORPortCookieAuthFile into config.c
Fixes bug 11635; bugfix on 0.2.5.1-alpha.
-rw-r--r-- | changes/bug11635 | 6 | ||||
-rw-r--r-- | src/or/config.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug11635 b/changes/bug11635 new file mode 100644 index 000000000..bb5eceee3 --- /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 3954c582e..b8aa7d369 100644 --- 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), |