From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 14 Jun 2011 19:15:43 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~250
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33124033fd650a603d64e91151c8faa96adc3f98;p=libevent

Merge remote-tracking branch 'origin/patches-2.0'
---

33124033fd650a603d64e91151c8faa96adc3f98