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

[nickm at torproject.org]

commit 4f596b3edfe5bcf4898bfe6007aa8e4677d2ba05
Merge: e8f086055 c862205ba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 19 08:02:09 2020 -0400

    Merge remote-tracking branch 'tor-github/pr/1807/head'

 src/test/test_circuitbuild.c | 4 ++++
 src/test/test_dir.c          | 4 ++++
 2 files changed, 8 insertions(+)