commit b343ba90604de524b5fa7d87a6daf76fcc118adb Merge: f64fa6b19 7ee67c47f Author: Nick Mathewson nickm@torproject.org Date: Thu May 10 09:22:32 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

changes/bug26069 | 5 +++++ src/or/hs_descriptor.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)