commit 242f9b3ffb6c100de5b9eb2cbccecbf07c68554f Merge: 9ec08f9 d004b92 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 28 11:17:30 2017 -0500

Merge remote-tracking branch 'public/bug21407'

changes/bug21407 | 4 ++++ src/or/circuitbuild.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)