Merge branch 'bug1863_bwhist' into maint-0.2.2

author Nick Mathewson <nickm@torproject.org>

Fri, 25 Feb 2011 16:22:12 +0000 (11:22 -0500)

committer Nick Mathewson <nickm@torproject.org>

Fri, 25 Feb 2011 16:22:12 +0000 (11:22 -0500)
author Nick Mathewson <nickm@torproject.org>
Fri, 25 Feb 2011 16:22:12 +0000 (11:22 -0500)
committer Nick Mathewson <nickm@torproject.org>
Fri, 25 Feb 2011 16:22:12 +0000 (11:22 -0500)
diff --cc src/or/config.c
Simple merge
diff --cc src/or/or.h
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Fri, 25 Feb 2011 16:22:12 +0000 (11:22 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Fri, 25 Feb 2011 16:22:12 +0000 (11:22 -0500)
		1	2
src/or/config.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/or.h	patch \|	diff1 \|	diff2 \|	blob \| history