commit 6a91cab79c23b47c48e35e95661dfbe81be943dd
Merge: c83bcc3 e1e62f9
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Mon Mar 21 13:26:04 2016 -0400
Merge branch 'maint-0.2.7'
changes/bug17668 | 5 ++++
changes/bug17702 | 6 ++++
changes/bug18318_ed | 7 +++++
changes/bug18368 | 5 ++++
src/or/dircollate.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++----
src/or/dircollate.h | 24 ++++++++++++++--
src/or/dirserv.c | 75 +++++++++++++++++++++++++++++++++++++-----------
src/or/dirserv.h | 2 +-
src/or/dirvote.c | 35 ++++++++++++++++++++++
src/or/dirvote.h | 7 +++--
src/or/networkstatus.c | 2 +-
src/or/or.h | 13 +++++++--
src/or/routerparse.c | 25 ++++++++--------
13 files changed, 239 insertions(+), 45 deletions(-)
diff --cc src/or/or.h
index 4c295ab,431927c..301901e
--- 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. */
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits