Merge branch 'maint-0.3.4'

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

diff --cc src/or/nodelist.c
index 5e575e9a83f46109a6fddbed7ae1157c9b4d9360,ce1830083f405dbe39e8a9853c5002ce93301418..060f5d908f52135f16a3354b256f20f9af33f951
--- 1/src/or/nodelist.c
--- 2/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)

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

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