From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 3 Feb 2010 21:25:34 +0000 (-0500)
Subject: Merge remote branch 'github/http_listener'
X-Git-Tag: release-2.0.4-alpha~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f654678484b7c4ad95626593c0ccdc696d841e8;p=libevent

Merge remote branch 'github/http_listener'

Conflicts:
	http.c
---

8f654678484b7c4ad95626593c0ccdc696d841e8