[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm at torproject.org]

commit 7444f2daf97dc91ebb74eed90053bdddc99ec1c1
Merge: 50cc49d 52c4440
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 29 15:57:48 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug22753           |  7 +++++++
 src/or/entrynodes.c        | 39 ++++++++++++++++++++++++++++++++++++++-
 src/or/entrynodes.h        |  9 +++++----
 src/or/nodelist.c          |  2 +-
 src/or/nodelist.h          |  2 ++
 src/test/test_entrynodes.c | 19 +++++++++++++++++--
 6 files changed, 70 insertions(+), 8 deletions(-)