diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-10 23:01:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-10 23:01:58 -0400 |
| commit | e270a066a6262784be317f003f6102430db24880 (patch) | |
| tree | 7125a6a92bdf9f2caee29e4934b51fa7277d8503 /src/or/or.h | |
| parent | 8b4195f0217d24bae6dfac944b469dc05b30bcd6 (diff) | |
| parent | f8960ea22bde03ae7c4cd60af395a541fb36354c (diff) | |
| download | tor-e270a066a6262784be317f003f6102430db24880.tar.gz tor-e270a066a6262784be317f003f6102430db24880.zip | |
Merge remote-tracking branch 'arma/bug6783_big_hammer' into maint-0.2.4
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 45eb4673ce..c2cd8a6cae 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3999,6 +3999,17 @@ typedef struct { /** Fraction: */ double PathsNeededToBuildCircuits; + + /** Do we serve v2 directory info at all? This is a temporary option, since + * we'd like to disable v2 directory serving entirely, but we need a way to + * make it temporarily disableable, in order to do fast testing and be + * able to turn it back on if it turns out to be non-workable. + * + * XXXX025 Make this always-on, or always-off. Right now, it's only + * enableable for authorities. + */ + int DisableV2DirectoryInfo_; + } or_options_t; /** Persistent state for an onion router, as saved to disk. */ |