commit 1a3f9f377ca616ec408fdcd9e64b9f75e4a46fb6 Merge: 340607639 df18cf0e8 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 7 08:44:40 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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