]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Sun, 9 Feb 2014 18:35:21 +0000 (13:35 -0500)
committerNick Mathewson <nickm@torproject.org>
Sun, 9 Feb 2014 18:35:21 +0000 (13:35 -0500)
1  2 
bufferevent_pair.c

Simple merge