commit 90b9e23bec4687962a999c2575909b9230bd425a Merge: 3401c34 d87143f Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 6 15:15:18 2015 -0500 Merge branch 'exitnode_10067_squashed' Conflicts: src/or/or.h changes/feature10067 | 12 ++++++++++++ doc/tor.1.txt | 13 +++++++++++++ src/or/config.c | 3 ++- src/or/or.h | 8 ++++++++ src/or/policies.c | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 71 insertions(+), 1 deletion(-) diff --cc src/or/or.h index c0ecadc,dadf556..58e2164 --- a/src/or/or.h +++ b/src/or/or.h @@@ -4259,18 -4229,16 +4259,26 @@@ typedef struct /** How long (seconds) do we keep a guard before picking a new one? */ int GuardLifetime; - /** Should we send the timestamps that pre-023 hidden services want? */ - int Support022HiddenServices; + /** Low-water mark for global scheduler - start sending when estimated + * queued size falls below this threshold. + */ + uint64_t SchedulerLowWaterMark__; + /** High-water mark for global scheduler - stop sending when estimated + * queued size exceeds this threshold. + */ + uint64_t SchedulerHighWaterMark__; + /** Flush size for global scheduler - flush this many cells at a time + * when sending. + */ + int SchedulerMaxFlushCells__; + + /** Is this an exit node? This is a tristate, where "1" means "yes, and use + * the default exit policy if none is given" and "0" means "no; exit policy + * is 'reject *'" and "auto" (-1) means "same as 1, but warn the user." + * + * XXXX Eventually, the default will be 0. */ + int ExitRelay; + } or_options_t; /** Persistent state for an onion router, as saved to disk. */