commit 912ae2b8dc5d13344035def71c6e083a92752c09 Merge: 1570f17f9 9d5c6317b Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 7 08:44:36 2018 -0400

Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9

changes/bug27463 | 3 +++ src/or/rendclient.c | 9 +++++++++ 2 files changed, 12 insertions(+)