[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug7890'

[nickm at torproject.org]

commit dc9ec519b51b8395a5d56b76f418f93c8734f97b
Merge: 005500e 9d59769
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 22 08:04:12 2017 -0400

    Merge remote-tracking branch 'public/bug7890'

 changes/bug7890       | 4 ++++
 src/or/circuitbuild.c | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)