aboutsummaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-02-24 07:45:20 -0500
committerNick Mathewson <nickm@torproject.org>2020-02-24 07:45:20 -0500
commitcaa392a73ad6c8e215a4686955c9de98eeb07661 (patch)
tree50de29ea7cbbf27ae656a4b7a865f76c1a66ae63 /src/app
parent7ba7f9c0de9d1b2435a01961379b3d85c4fc2ab5 (diff)
parent93cb8072becb4213525d08a87fdf7284e6257168 (diff)
downloadtor-caa392a73ad6c8e215a4686955c9de98eeb07661.tar.gz
tor-caa392a73ad6c8e215a4686955c9de98eeb07661.zip
Merge remote-tracking branch 'tor-github/pr/1685/head'
Diffstat (limited to 'src/app')
-rw-r--r--src/app/config/config.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c
index bbf984ad08..57aa055e73 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -510,6 +510,8 @@ static const config_var_t option_vars_[] = {
LINELIST_S, RendConfigLines, NULL),
VAR("HiddenServiceEnableIntroDoSBurstPerSec",
LINELIST_S, RendConfigLines, NULL),
+ VAR("HiddenServiceOnionBalanceInstance",
+ LINELIST_S, RendConfigLines, NULL),
VAR("HiddenServiceStatistics", BOOL, HiddenServiceStatistics_option, "1"),
V(HidServAuth, LINELIST, NULL),
V(ClientOnionAuthDir, FILENAME, NULL),