Merge branch 'exitnode_10067_squashed'

Conflicts:
	src/or/or.h

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/or/config.c
Simple merge

diff --cc src/or/or.h
index c0ecadc0e298485c508d628174c08ab726454dff,dadf5561af2457e6eda2bd0c6f0812202c2cc51d..58e2164665efaa6dbb0f4cd506142a2a06623e25
--- 1/src/or/or.h
--- 2/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. */

diff --cc src/or/policies.c
Simple merge