Merge remote-tracking branch 'ahf-github/maint-0.3.0' into maint-0.3.1

author Nick Mathewson <nickm@torproject.org>

Fri, 29 Jun 2018 17:06:11 +0000 (13:06 -0400)

committer Nick Mathewson <nickm@torproject.org>

Fri, 29 Jun 2018 17:06:11 +0000 (13:06 -0400)
author Nick Mathewson <nickm@torproject.org>
Fri, 29 Jun 2018 17:06:11 +0000 (13:06 -0400)
committer Nick Mathewson <nickm@torproject.org>
Fri, 29 Jun 2018 17:06:11 +0000 (13:06 -0400)
diff --cc src/or/hs_descriptor.c
Simple merge
diff --cc src/test/test_hs_descriptor.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Fri, 29 Jun 2018 17:06:11 +0000 (13:06 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Fri, 29 Jun 2018 17:06:11 +0000 (13:06 -0400)
		1	2
src/or/hs_descriptor.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/test_hs_descriptor.c	patch \|	diff1 \|	diff2 \|	blob \| history