[tor-commits] [tor/master] Merge branch 'maint-0.3.4'

[nickm at torproject.org]

commit 11a76b903b283ee39ab0dbf9d926d4c4b60b7a92
Merge: 334edc22d 7b9cd5cca
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 20 08:05:07 2018 -0400

    Merge branch 'maint-0.3.4'

 changes/bug24977         |  5 +++++
 src/or/hs_common.c       | 17 +++++++++++------
 src/or/nodelist.c        | 30 ++++++++++++++++++++++++++++++
 src/or/nodelist.h        |  1 +
 src/or/voting_schedule.c | 26 +++++++++++++++++++++++++-
 src/or/voting_schedule.h |  4 ++++
 6 files changed, 76 insertions(+), 7 deletions(-)

diff --cc src/or/nodelist.c
index 5e575e9a8,ce1830083..060f5d908
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@@ -638,17 -635,14 +643,23 @@@ nodelist_set_consensus(networkstatus_t 
        }
      } SMARTLIST_FOREACH_END(node);
    }
+ 
+   /* If the consensus is live, note down the consensus valid-after that formed
+    * the nodelist. */
+   if (networkstatus_is_live(ns, approx_time())) {
+     the_nodelist->live_consensus_valid_after = ns->valid_after;
+   }
  }
  
 +/** Return 1 iff <b>node</b> has Exit flag and no BadExit flag.
 + * Otherwise, return 0.
 + */
 +int
 +node_is_good_exit(const node_t *node)
 +{
 +  return node->is_exit && ! node->is_bad_exit;
 +}
 +
  /** Helper: return true iff a node has a usable amount of information*/
  static inline int
  node_is_usable(const node_t *node)