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

[nickm at torproject.org]

commit b2ae5fc96bf82501f100c882e433100439346d63
Merge: 62c87f8 1712dc9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 29 15:57:48 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 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(-)