diff options
author | Nick Mathewson <nickm@torproject.org> | 2015-01-20 14:07:37 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2015-01-20 14:07:37 -0500 |
commit | e7e33d4b04be508e327f79786e1e0a885afd7a6d (patch) | |
tree | 7c43f361338709c0bc651660c15393bdf892c646 /src/or/config.c | |
parent | 9ddc1fb10c0e40fccee6d4d8b122250f8358ca81 (diff) | |
parent | 18a15747efe29d2df7a8ea852439fd30886cf9b3 (diff) | |
download | tor-e7e33d4b04be508e327f79786e1e0a885afd7a6d.tar.gz tor-e7e33d4b04be508e327f79786e1e0a885afd7a6d.zip |
Merge branch 'bug14084'
Diffstat (limited to 'src/or/config.c')
-rw-r--r-- | src/or/config.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index e747adde6b..baff4198ee 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -281,6 +281,7 @@ static config_var_t option_vars_[] = { VAR("HiddenServicePort", LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceVersion",LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceAuthorizeClient",LINELIST_S,RendConfigLines, NULL), + VAR("HiddenServiceAllowUnknownPorts",LINELIST_S, RendConfigLines, NULL), V(HiddenServiceStatistics, BOOL, "0"), V(HidServAuth, LINELIST, NULL), V(CloseHSClientCircuitsImmediatelyOnTimeout, BOOL, "0"), |