]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/pr/175'
authorNick Mathewson <nickm@torproject.org>
Sun, 30 Nov 2014 16:11:33 +0000 (11:11 -0500)
committerNick Mathewson <nickm@torproject.org>
Sun, 30 Nov 2014 16:11:33 +0000 (11:11 -0500)

Trivial merge