[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug23760_nc'

[nickm at torproject.org]

commit 1cc344b277bed85517ddc20b47e697391d58e4cb
Merge: add37440f 83b8034a9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 21 13:56:57 2017 -0500

    Merge remote-tracking branch 'teor/bug23760_nc'

 changes/ticket23760   | 4 ++++
 src/or/circuitbuild.c | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)