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

Trivial merge