diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-09-22 09:19:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-09-22 09:19:28 -0400 |
| commit | e94ef30a2fa6ef0197fe9fafbb2469475d868627 (patch) | |
| tree | b6ff0db12c54fe874a640d439a9d508d00bad31c /src/or/config.c | |
| parent | 2a9650625f5ce2cbad67299ce57c92bc70677a9b (diff) | |
| parent | d70b1b4da13d30f16ba0604103a1ebe915a2a20a (diff) | |
| download | tor-e94ef30a2fa6ef0197fe9fafbb2469475d868627.tar.gz tor-e94ef30a2fa6ef0197fe9fafbb2469475d868627.zip | |
Merge branch 'feature16944_v2'
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 98d9d83846..47a1ee1fa5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -333,6 +333,7 @@ static config_var_t option_vars_[] = { V(NumCPUs, UINT, "0"), V(NumDirectoryGuards, UINT, "0"), V(NumEntryGuards, UINT, "0"), + V(OfflineMasterKey, BOOL, "0"), V(ORListenAddress, LINELIST, NULL), VPORT(ORPort, LINELIST, NULL), V(OutboundBindAddress, LINELIST, NULL), |