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

[nickm at torproject.org]

commit 61d5bcc1a251002d726e66461ec576d9b71cebd1
Merge: b7ed61167 5f2e00241
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Aug 11 10:04:04 2018 -0400

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

 changes/bug27034           |  6 ++++++
 src/feature/relay/router.c | 26 ++++++++------------------
 src/test/test_policy.c     |  2 +-
 3 files changed, 15 insertions(+), 19 deletions(-)