summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-06-30 11:18:00 -0400
committerNick Mathewson <nickm@torproject.org>2016-06-30 11:18:00 -0400
commitc6846d7bf0d8a382bea17304ea29a51c3a895f90 (patch)
tree9a19d14b30659e2e7b1cf47be683bc9da2abc677 /src/or/or.h
parenta31f55b16ba26c5c3720640bf27157fd7ab45c40 (diff)
parent13a16e001164581b687dae2d3377f77eedb701ff (diff)
downloadtor-c6846d7bf0d8a382bea17304ea29a51c3a895f90.tar.gz
tor-c6846d7bf0d8a382bea17304ea29a51c3a895f90.zip
Merge remote-tracking branch 'andrea/bug18322_v3_squashed'
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index ea38022f43..a1a0810e4b 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4498,6 +4498,11 @@ typedef struct {
/** Autobool: Do we try to retain capabilities if we can? */
int KeepBindCapabilities;
+
+ /** Maximum total size of unparseable descriptors to log during the
+ * lifetime of this Tor process.
+ */
+ uint64_t MaxUnparseableDescSizeToLog;
} or_options_t;
/** Persistent state for an onion router, as saved to disk. */