diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-07-01 15:29:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-07-01 15:29:05 -0400 |
| commit | aaa31290431ea2cd1d1e8498dbe271eb53d2389d (patch) | |
| tree | d7ff38ffee26c5ab4571f089e8cf06d9e687a14c /src/or/config.c | |
| parent | 738a8c655a1f8067b330b132164fa8879ef102c3 (diff) | |
| parent | 36e201dffc5d57d92113e1e68ad4b6a0a7b3471e (diff) | |
| download | tor-aaa31290431ea2cd1d1e8498dbe271eb53d2389d.tar.gz tor-aaa31290431ea2cd1d1e8498dbe271eb53d2389d.zip | |
Merge remote-tracking branch 'dgoulet/ticket16943_029_05-squashed'
Trivial Conflicts:
src/or/or.h
src/or/routerparse.c
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 45acd39980..754b0afb9e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -440,6 +440,7 @@ static config_var_t option_vars_[] = { V(UseNTorHandshake, AUTOBOOL, "1"), V(User, STRING, NULL), V(UserspaceIOCPBuffers, BOOL, "0"), + V(AuthDirSharedRandomness, BOOL, "1"), OBSOLETE("V1AuthoritativeDirectory"), OBSOLETE("V2AuthoritativeDirectory"), VAR("V3AuthoritativeDirectory",BOOL, V3AuthoritativeDir, "0"), |