Merge commit 'karsten/bug997-hidservfetch'

author Nick Mathewson <nickm@torproject.org>

Tue, 16 Jun 2009 20:26:02 +0000 (16:26 -0400)

committer Nick Mathewson <nickm@torproject.org>

Tue, 16 Jun 2009 20:26:02 +0000 (16:26 -0400)
author Nick Mathewson <nickm@torproject.org>
Tue, 16 Jun 2009 20:26:02 +0000 (16:26 -0400)
committer Nick Mathewson <nickm@torproject.org>
Tue, 16 Jun 2009 20:26:02 +0000 (16:26 -0400)
diff --cc ChangeLog
Simple merge
diff --cc src/or/connection_edge.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Tue, 16 Jun 2009 20:26:02 +0000 (16:26 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Tue, 16 Jun 2009 20:26:02 +0000 (16:26 -0400)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/or/connection_edge.c	patch \|	diff1 \|	diff2 \|	blob \| history