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

author Nick Mathewson <nickm@torproject.org>

Mon, 8 Sep 2014 19:16:45 +0000 (15:16 -0400)

committer Nick Mathewson <nickm@torproject.org>

Mon, 8 Sep 2014 19:16:45 +0000 (15:16 -0400)
author Nick Mathewson <nickm@torproject.org>
Mon, 8 Sep 2014 19:16:45 +0000 (15:16 -0400)
committer Nick Mathewson <nickm@torproject.org>
Mon, 8 Sep 2014 19:16:45 +0000 (15:16 -0400)
diff --cc src/or/control.c
Simple merge
diff --cc src/or/or.h
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Mon, 8 Sep 2014 19:16:45 +0000 (15:16 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Mon, 8 Sep 2014 19:16:45 +0000 (15:16 -0400)
		1	2
src/or/control.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/or.h	patch \|	diff1 \|	diff2 \|	blob \| history