Merge branch 'maint-0.3.3' into maint-0.3.4

author Nick Mathewson <nickm@torproject.org>

Thu, 15 Nov 2018 21:47:25 +0000 (16:47 -0500)

committer Nick Mathewson <nickm@torproject.org>

Thu, 15 Nov 2018 21:47:25 +0000 (16:47 -0500)
author Nick Mathewson <nickm@torproject.org>
Thu, 15 Nov 2018 21:47:25 +0000 (16:47 -0500)
committer Nick Mathewson <nickm@torproject.org>
Thu, 15 Nov 2018 21:47:25 +0000 (16:47 -0500)
diff --cc doc/tor.1.txt
Simple merge
diff --cc src/or/config.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Thu, 15 Nov 2018 21:47:25 +0000 (16:47 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Thu, 15 Nov 2018 21:47:25 +0000 (16:47 -0500)
		1	2
doc/tor.1.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/config.c	patch \|	diff1 \|	diff2 \|	blob \| history