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

[nickm at torproject.org]

commit 2c49a9852dd7b8241f823ea0a0c8d90581518c7d
Merge: 784b29a bdd267e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 22 10:56:08 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1

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