Merge branch 'exitnode_10067_squashed'

Conflicts:
	src/or/or.h

1 files changed, 8 insertions, 0 deletions

diff --git a/src/or/or.h b/src/or/or.h
index c0ecadc0e2..58e2164665 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4271,6 +4271,14 @@ typedef struct {
    * 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. */