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

[nickm at torproject.org]

commit 71b9f4f0bb8fe62bbc5c8b92d5172a6d5ba0f068
Merge: 3781678 1712dc9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 29 15:57:49 2017 -0400

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