]> granicus.if.org Git - libevent/commitdiff
Merge branch '20_cve_2014_6272_v2' into patches-2.0
authorNick Mathewson <nickm@torproject.org>
Mon, 5 Jan 2015 14:30:02 +0000 (09:30 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 5 Jan 2015 14:30:02 +0000 (09:30 -0500)
1  2 
configure.ac

diff --cc configure.ac
Simple merge