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

[nickm at torproject.org]

commit 6e940829cce9e822f7fbd07e260a62a195a94143
Merge: 79f8641ee 33c99cf56
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 14 12:54:13 2018 -0400

    Merge remote-tracking branch 'dgoulet/ticket27040_035_01'

 changes/ticket27040           | 5 +++++
 src/feature/rend/rendcommon.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)