commit 07b486c17a0c268bdcc5c47c41948ed4e16baa02 Merge: 3a2470762 5458ff20a Author: Nick Mathewson nickm@torproject.org Date: Tue May 1 08:51:32 2018 -0400

Merge branch 'bug24734_squashed'

changes/ticket24734 | 6 ++++ src/or/circuitbuild.c | 9 ++--- src/or/directory.c | 12 +++---- src/or/policies.c | 98 +++++++++++++++++++++++++------------------------- src/or/policies.h | 14 ++++---- src/test/test_policy.c | 14 +++----- 6 files changed, 76 insertions(+), 77 deletions(-)