commit 01fc93ffef3843a86710718c12ba9be67dcca2bc Merge: f525804 0fdad78 Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 10 12:12:14 2017 -0400

Merge remote-tracking branch 'dgoulet/bug16706_031_01'

changes/bug16706 | 3 +++ src/or/relay.c | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)