[tor-commits] [tor/master] Merge remote-tracking branch 'arma/ticket22420'

[nickm at torproject.org]

commit f6946d7a823875211bd84cfa4565ed1b83b1dfc2
Merge: 32948eb 084b64b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 19 14:03:57 2017 -0400

    Merge remote-tracking branch 'arma/ticket22420'

 src/or/relay.c | 41 ++++++++++++++---------------------------
 1 file changed, 14 insertions(+), 27 deletions(-)