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

[nickm at torproject.org]

commit 914ec372a9352308c3990afb5304f7e8d39b1020
Merge: 80c8689be 0755bcc36
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 31 09:47:36 2018 -0500

    Merge branch 'bug24927'

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