From: Nick Mathewson Date: Wed, 8 Jun 2011 21:38:17 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/patches-2.0' X-Git-Tag: release-2.1.1-alpha~252 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4df9b433054b4707aba0e9e285dadb4f05205f8c;p=libevent Merge remote-tracking branch 'origin/patches-2.0' --- 4df9b433054b4707aba0e9e285dadb4f05205f8c