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

commit c7b6ed1d8065375e430d54c14f79d3bd0d6abbe5 Merge: 3eeb7c6e2 45b28167d Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 7 11:21:13 2018 -0500

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

changes/bug25885 | 7 +++++++ src/core/or/circuitbuild.c | 21 ++++++++++++--------- src/core/or/circuitbuild.h | 3 ++- src/test/test_circuitbuild.c | 4 ++-- 4 files changed, 23 insertions(+), 12 deletions(-)