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

[nickm at torproject.org]

commit 78011bb7bace31ecba7dff5e07d84306bf98698c
Merge: 2e93bff 957b9f8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 1 09:09:58 2017 -0500

    Merge branch 'bug21242'

 changes/bug21242      | 10 ++++++++
 src/or/circuitbuild.c |  2 +-
 src/or/entrynodes.c   | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/or/entrynodes.h   |  6 +++++
 src/or/nodelist.c     |  8 +++++++
 5 files changed, 88 insertions(+), 2 deletions(-)