commit 40487b0141096ddb40bec38f7d1c6a4367d8c279 Merge: df2615d 70b9e79 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 3 14:35:03 2016 -0400

Merge remote-tracking branch 'dgoulet/bug20376_030_01'

src/or/relay.c | 7 +++---- src/or/rendmid.c | 19 ++++++++++--------- src/or/rendservice.c | 6 ++---- 3 files changed, 15 insertions(+), 17 deletions(-)