Merge branch 'bug8037_squashed' into maint-0.2.4

author Nick Mathewson <nickm@torproject.org>

Wed, 17 Apr 2013 14:45:45 +0000 (10:45 -0400)

committer Nick Mathewson <nickm@torproject.org>

Wed, 17 Apr 2013 14:45:45 +0000 (10:45 -0400)
author Nick Mathewson <nickm@torproject.org>
Wed, 17 Apr 2013 14:45:45 +0000 (10:45 -0400)
committer Nick Mathewson <nickm@torproject.org>
Wed, 17 Apr 2013 14:45:45 +0000 (10:45 -0400)
diff --cc src/common/util.c
Simple merge
diff --cc src/common/util.h
Simple merge
diff --cc src/or/routerparse.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Wed, 17 Apr 2013 14:45:45 +0000 (10:45 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Wed, 17 Apr 2013 14:45:45 +0000 (10:45 -0400)
		1	2
src/common/util.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/util.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/routerparse.c	patch \|	diff1 \|	diff2 \|	blob \| history