[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

[dgoulet at torproject.org]

commit 8fb318860ecd399a59b830920e4aa21607a7b3ce
Merge: d000e798a 6f2151be9
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Nov 13 10:43:03 2018 -0500

    Merge branch 'maint-0.3.5'

 changes/bug27841               | 7 +++++++
 src/feature/hs/hs_intropoint.c | 6 ------
 2 files changed, 7 insertions(+), 6 deletions(-)