diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-16 11:40:19 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-16 11:40:19 -0500 |
| commit | 990a863d7ca74c84238791607b6515813b3b5633 (patch) | |
| tree | db6a28b4668e2029c00029b674e6f08c4c8264bc /src/or/config.c | |
| parent | 988b0afbd6bbb97e3ca796a608a4087888f162aa (diff) | |
| parent | 506bd6d47c9c003a94eae7132e83b682a53f0bc9 (diff) | |
| download | tor-990a863d7ca74c84238791607b6515813b3b5633.tar.gz tor-990a863d7ca74c84238791607b6515813b3b5633.zip | |
Merge branch 'ticket20831_v2'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index aba567a835..6c8976d1c8 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -496,7 +496,7 @@ static config_var_t option_vars_[] = { V(UpdateBridgesFromAuthority, BOOL, "0"), V(UseBridges, BOOL, "0"), VAR("UseEntryGuards", BOOL, UseEntryGuards_option, "1"), - V(UseEntryGuardsAsDirGuards, BOOL, "1"), + OBSOLETE("UseEntryGuardsAsDirGuards"), V(UseGuardFraction, AUTOBOOL, "auto"), V(UseMicrodescriptors, AUTOBOOL, "auto"), OBSOLETE("UseNTorHandshake"), |