]> granicus.if.org Git - libevent/commitdiff
Merge branch '21_cve_2014_6272_v2'
authorNick Mathewson <nickm@torproject.org>
Mon, 5 Jan 2015 14:33:02 +0000 (09:33 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 5 Jan 2015 14:33:02 +0000 (09:33 -0500)

Trivial merge