Merge branch 'maint-0.2.7'

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

diff --cc src/or/dircollate.h
Simple merge

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

diff --cc src/or/dirserv.h
Simple merge

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

diff --cc src/or/dirvote.h
Simple merge

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

diff --cc src/or/or.h
index 4c295ab9615fe3a544f35d5c8330f3aad00e3a6e,431927c7e739ef49ab4e9c239e125c853147ab3a..301901e71c4be3be5ef3d6245c1bd2e1b172791e
--- 1/src/or/or.h
--- 2/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. */

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