[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug21293_031_01'

[nickm at torproject.org]

commit ec7c512d272d366e8e7de61aaf8108bca0adf957
Merge: 6bf82a4 368b091
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 25 10:43:53 2017 -0400

    Merge remote-tracking branch 'dgoulet/bug21293_031_01'

 changes/bug21293 | 5 +++++
 src/or/relay.c   | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)