diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-05-19 08:46:13 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-05-19 08:46:13 -0400 |
commit | 92d335b3dcd7b302d8a07c105f9fe8a98848cad3 (patch) | |
tree | fe1cebe40b18b1409489d29fba8e1fcc809b7e0e /src/or/or.h | |
parent | d34fa32ece2179c18f8aeae0026d2b452956842f (diff) | |
parent | ba3a5f82f11388237a3ba4995ddf0b6ffaaf492a (diff) | |
download | tor-92d335b3dcd7b302d8a07c105f9fe8a98848cad3.tar.gz tor-92d335b3dcd7b302d8a07c105f9fe8a98848cad3.zip |
Merge remote-tracking branch 'jigsaw/torrc-dir-fix-1922_squashed2'
Diffstat (limited to 'src/or/or.h')
-rw-r--r-- | src/or/or.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index acbf8cebbb..0d29e19d75 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4549,6 +4549,9 @@ typedef struct { * do we enforce Ed25519 identity match? */ /* NOTE: remove this option someday. */ int AuthDirTestEd25519LinkKeys; + + /** Bool (default: 0): Tells if a %include was used on torrc */ + int IncludeUsed; } or_options_t; /** Persistent state for an onion router, as saved to disk. */ |