commit 2ab1de9f3b9001f3c88cdb9da2e4c4d75c9b5ec6 Merge: 3844579 5b33d95 Author: Nick Mathewson nickm@torproject.org Date: Tue May 30 13:21:17 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

changes/bug22447 | 3 +++ src/or/hs_descriptor.c | 23 ++++------------------- src/test/test_hs_descriptor.c | 5 ++--- 3 files changed, 9 insertions(+), 22 deletions(-)