Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

author Nick Mathewson <nickm@torproject.org>

Fri, 3 Apr 2015 13:38:54 +0000 (09:38 -0400)

committer Nick Mathewson <nickm@torproject.org>

Fri, 3 Apr 2015 13:38:54 +0000 (09:38 -0400)
author Nick Mathewson <nickm@torproject.org>
Fri, 3 Apr 2015 13:38:54 +0000 (09:38 -0400)
committer Nick Mathewson <nickm@torproject.org>
Fri, 3 Apr 2015 13:38:54 +0000 (09:38 -0400)
diff --cc src/or/or.h
Simple merge
diff --cc src/or/rendmid.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Fri, 3 Apr 2015 13:38:54 +0000 (09:38 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Fri, 3 Apr 2015 13:38:54 +0000 (09:38 -0400)
		1	2
src/or/or.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/rendmid.c	patch \|	diff1 \|	diff2 \|	blob \| history