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

author Nick Mathewson <nickm@torproject.org>

Thu, 25 Apr 2013 02:16:07 +0000 (22:16 -0400)

committer Nick Mathewson <nickm@torproject.org>

Thu, 25 Apr 2013 02:16:07 +0000 (22:16 -0400)
author Nick Mathewson <nickm@torproject.org>
Thu, 25 Apr 2013 02:16:07 +0000 (22:16 -0400)
committer Nick Mathewson <nickm@torproject.org>
Thu, 25 Apr 2013 02:16:07 +0000 (22:16 -0400)
diff --cc src/or/config.c
Simple merge
diff --cc src/or/connection.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Thu, 25 Apr 2013 02:16:07 +0000 (22:16 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Thu, 25 Apr 2013 02:16:07 +0000 (22:16 -0400)
		1	2
src/or/config.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/connection.c	patch \|	diff1 \|	diff2 \|	blob \| history