[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/344'

[nickm at torproject.org]

commit 92528146463e6e5bfbc5821dfdded67e5ea27f45
Merge: 5ef998fbf 863e2fcb4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 18 08:15:02 2018 -0400

    Merge remote-tracking branch 'tor-github/pr/344'

 src/core/or/circuitbuild.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)