From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 21 Mar 2016 17:26:04 +0000 (-0400)
Subject: Merge branch 'maint-0.2.7'
X-Git-Tag: tor-0.2.8.2-alpha~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a91cab79c23b47c48e35e95661dfbe81be943dd;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.7'
---

6a91cab79c23b47c48e35e95661dfbe81be943dd
diff --cc src/or/or.h
index 4c295ab961,431927c7e7..301901e71c
--- a/src/or/or.h
+++ b/src/or/or.h
@@@ -2153,11 -2081,10 +2153,15 @@@ typedef struct 
     * tests for it. */
    unsigned int needs_retest_if_added:1;
  
 +  /** True iff this router included "tunnelled-dir-server" in its descriptor,
 +   * implying it accepts tunnelled directory requests, or it advertised
 +   * dir_port > 0. */
 +  unsigned int supports_tunnelled_dir_requests:1;
 +
+   /** Used during voting to indicate that we should not include an entry for
+    * this routerinfo. Used only during voting. */
+   unsigned int omit_from_vote:1;
+ 
  /** Tor can use this router for general positions in circuits; we got it
   * from a directory server as usual, or we're an authority and a server
   * uploaded it. */