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

[nickm at torproject.org]

commit 6961609a1c62fb25b305c60e4d3ad49263da834c
Merge: a384937f8 7ce8d5513
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 6 12:13:41 2018 -0500

    Merge remote-tracking branch 'dgoulet/bug25116_029_01'

 changes/bug25116    | 4 ++++
 src/or/circuituse.c | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)