Merge branch 'maint-0.2.4' into maint-0.2.5

author Roger Dingledine <arma@torproject.org>

Thu, 24 Jul 2014 20:23:08 +0000 (16:23 -0400)

committer Roger Dingledine <arma@torproject.org>

Thu, 24 Jul 2014 20:23:08 +0000 (16:23 -0400)
author Roger Dingledine <arma@torproject.org>
Thu, 24 Jul 2014 20:23:08 +0000 (16:23 -0400)
committer Roger Dingledine <arma@torproject.org>
Thu, 24 Jul 2014 20:23:08 +0000 (16:23 -0400)
diff --cc doc/tor.1.txt
Simple merge
diff --cc src/or/config.c
Simple merge
diff --cc src/or/entrynodes.c
Simple merge
author	Roger Dingledine <arma@torproject.org>
	Thu, 24 Jul 2014 20:23:08 +0000 (16:23 -0400)
committer	Roger Dingledine <arma@torproject.org>
	Thu, 24 Jul 2014 20:23:08 +0000 (16:23 -0400)
		1	2
doc/tor.1.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/config.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/entrynodes.c	patch \|	diff1 \|	diff2 \|	blob \| history