[tor-commits] [tor/maint-0.3.4] Merge branch 'asn_bug24977_final_squashed' into maint-0.3.4

[nickm at torproject.org]

commit 7b9cd5cca54d0077c0f8c163a58b055c85bf067f
Merge: 4971d7afa 1f1a57b8d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 20 08:02:27 2018 -0400

    Merge branch 'asn_bug24977_final_squashed' into 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(-)