[tor-commits] [tor/master] Merge branch 'bug18517_squashed'

[nickm at torproject.org]

commit 424af93ded7e1d9d98733ed17b2b6fee143262b9
Merge: 54559e5 f2153f9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 24 10:14:05 2016 -0400

    Merge branch 'bug18517_squashed'

 changes/bug18517      |  6 ++++++
 doc/tor.1.txt         | 19 ++++++++++++-------
 src/or/circuitbuild.c | 11 +++++++++--
 src/or/entrynodes.c   | 24 +++++++++++++++++++++++-
 src/or/entrynodes.h   |  3 +++
 5 files changed, 53 insertions(+), 10 deletions(-)