[tor-commits] [tor/master] Merge remote-tracking branch 'ahf/bugs/21206'

[nickm at torproject.org]

commit 0e7d2882f98df9a26e6a30170d39c7746d1b4ccd
Merge: 17fa498 3848d23
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 27 10:53:12 2017 -0500

    Merge remote-tracking branch 'ahf/bugs/21206'

 src/or/connection_edge.c |  6 ++---
 src/or/directory.c       | 66 +++++++++++++++++++++++++++++++++++-------------
 src/or/or.h              |  8 ++++++
 src/or/relay.c           | 20 +++++++++++++++
 4 files changed, 79 insertions(+), 21 deletions(-)