diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-21 09:40:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-21 09:40:16 -0400 |
| commit | 0e4c42a912d020888e811b748925362e1b3dc67b (patch) | |
| tree | 90a9e0e682a06bdf1af1ea9b0940dd81e20786e2 /src/app | |
| parent | a1b0283040723474377a5746dbd01782a9b7eaa7 (diff) | |
| parent | 03ef4ec466fd7f1de097a7b0244ca5bc8cc32b18 (diff) | |
| download | tor-0e4c42a912d020888e811b748925362e1b3dc67b.tar.gz tor-0e4c42a912d020888e811b748925362e1b3dc67b.zip | |
Merge remote-tracking branch 'ahf-github/asn/bugs4700_2'
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 0b2c391fea..abb3407043 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -460,6 +460,7 @@ static config_var_t option_vars_[] = { VAR("HiddenServiceMaxStreams",LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceMaxStreamsCloseCircuit",LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceNumIntroductionPoints", LINELIST_S, RendConfigLines, NULL), + VAR("HiddenServiceExportCircuitID", LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceStatistics", BOOL, HiddenServiceStatistics_option, "1"), V(HidServAuth, LINELIST, NULL), V(ClientOnionAuthDir, FILENAME, NULL), |