Merge remote-tracking branch 'public/bug10431'

author Nick Mathewson <nickm@torproject.org>

Wed, 9 Apr 2014 12:29:21 +0000 (08:29 -0400)

committer Nick Mathewson <nickm@torproject.org>

Wed, 9 Apr 2014 12:29:21 +0000 (08:29 -0400)
author Nick Mathewson <nickm@torproject.org>
Wed, 9 Apr 2014 12:29:21 +0000 (08:29 -0400)
committer Nick Mathewson <nickm@torproject.org>
Wed, 9 Apr 2014 12:29:21 +0000 (08:29 -0400)
diff --cc src/or/control.c

index 7f421a71d507cf4045cff992770357f4fda840e4,43c0539ddbcdf3ecec1fb35689bfdac9836e99ca..c91705257df15491c1e9a9a896535a04c68cdbfa

mode 100755,100644..100755
--- 1/src/or/control.c
--- 2/src/or/control.c
+++ b/src/or/control.c
diff --cc src/or/or.h
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Wed, 9 Apr 2014 12:29:21 +0000 (08:29 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Wed, 9 Apr 2014 12:29:21 +0000 (08:29 -0400)
		1	2
src/or/control.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/or.h	patch \|	diff1 \|	diff2 \|	blob \| history