Merge branch '10267_plus_10896_rebased_twice'

author Nick Mathewson <nickm@torproject.org>

Thu, 17 Apr 2014 03:03:41 +0000 (23:03 -0400)

committer Nick Mathewson <nickm@torproject.org>

Thu, 17 Apr 2014 03:03:41 +0000 (23:03 -0400)
author Nick Mathewson <nickm@torproject.org>
Thu, 17 Apr 2014 03:03:41 +0000 (23:03 -0400)
committer Nick Mathewson <nickm@torproject.org>
Thu, 17 Apr 2014 03:03:41 +0000 (23:03 -0400)
diff --cc src/or/config.c
Simple merge
diff --cc src/or/or.h
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Thu, 17 Apr 2014 03:03:41 +0000 (23:03 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Thu, 17 Apr 2014 03:03:41 +0000 (23:03 -0400)
		1	2
src/or/config.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/or.h	patch \|	diff1 \|	diff2 \|	blob \| history