Merge branch 'maint-0.3.3'

author Nick Mathewson <nickm@torproject.org>

Wed, 11 Apr 2018 14:48:46 +0000 (10:48 -0400)

committer Nick Mathewson <nickm@torproject.org>

Wed, 11 Apr 2018 14:48:46 +0000 (10:48 -0400)
author Nick Mathewson <nickm@torproject.org>
Wed, 11 Apr 2018 14:48:46 +0000 (10:48 -0400)
committer Nick Mathewson <nickm@torproject.org>
Wed, 11 Apr 2018 14:48:46 +0000 (10:48 -0400)
diff --cc src/or/circuituse.c
Simple merge
diff --cc src/or/or.h
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Wed, 11 Apr 2018 14:48:46 +0000 (10:48 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Wed, 11 Apr 2018 14:48:46 +0000 (10:48 -0400)
		1	2
src/or/circuituse.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/or.h	patch \|	diff1 \|	diff2 \|	blob \| history