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

[nickm at torproject.org]

commit 90046a09dd95c789e28f63c320c1c16e58ecf57a
Merge: ee7101a 2c49a98
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 22 10:56:08 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/bug22400_01 |  4 ++++
 src/or/entrynodes.c | 36 +++++++++++++++++++++++++-----------
 2 files changed, 29 insertions(+), 11 deletions(-)