[tor-commits] [tor/master] Merge branch 'pr_1930_squashed'

[nickm at torproject.org]

commit ceddc39c597c7d794cc4b875820e872fbaad5a4b
Merge: 033f80442 5a89fd2a0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 22 15:33:27 2020 -0400

    Merge branch 'pr_1930_squashed'

 changes/ticket33816                    |  4 ++
 src/feature/relay/circuitbuild_relay.c | 52 ++++++++++++++++++++++++
 src/feature/relay/circuitbuild_relay.h |  2 +
 src/test/test_circuitbuild.c           | 73 ++++++++++++++++++++++++++++++++++
 4 files changed, 131 insertions(+)