]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'github/master'
authorNick Mathewson <nickm@torproject.org>
Wed, 1 Jun 2011 18:02:56 +0000 (14:02 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 1 Jun 2011 18:02:56 +0000 (14:02 -0400)

Trivial merge