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

commit 40c7871f46bbfe03480eb159e5365f49e6df24f5 Merge: 17073d723 1168e21b4 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Aug 3 09:14:12 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23078 | 7 +++++++ src/or/hs_intropoint.c | 11 ++++------- 2 files changed, 11 insertions(+), 7 deletions(-)