[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug24469_033_01'

[nickm at torproject.org]

commit 88b146cda58087dea5d8945e02f2e2f5ebbe6a97
Merge: ca85d6621 fb93c6fc5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 1 08:22:44 2018 -0500

    Merge remote-tracking branch 'dgoulet/bug24469_033_01'

 changes/bug24469     |  4 ++++
 src/or/circuitlist.c |  7 +++++++
 src/or/entrynodes.c  | 16 ++++++++++++++++
 src/or/entrynodes.h  |  2 ++
 4 files changed, 29 insertions(+)