Merge branch 'maint-0.2.4' into maint-0.2.5

author Roger Dingledine <arma@torproject.org>

Mon, 28 Jul 2014 06:47:15 +0000 (02:47 -0400)

committer Roger Dingledine <arma@torproject.org>

Mon, 28 Jul 2014 06:47:15 +0000 (02:47 -0400)
author Roger Dingledine <arma@torproject.org>
Mon, 28 Jul 2014 06:47:15 +0000 (02:47 -0400)
committer Roger Dingledine <arma@torproject.org>
Mon, 28 Jul 2014 06:47:15 +0000 (02:47 -0400)
diff --cc src/or/command.c
Simple merge
diff --cc src/or/control.c
Simple merge
author	Roger Dingledine <arma@torproject.org>
	Mon, 28 Jul 2014 06:47:15 +0000 (02:47 -0400)
committer	Roger Dingledine <arma@torproject.org>
	Mon, 28 Jul 2014 06:47:15 +0000 (02:47 -0400)
		1	2
src/or/command.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/control.c	patch \|	diff1 \|	diff2 \|	blob \| history