]> granicus.if.org Git - libevent/commit
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 14 Feb 2012 20:44:03 +0000 (15:44 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 14 Feb 2012 20:44:03 +0000 (15:44 -0500)
commita37cbfdafc0f9c9d507cf716c2acff612c1af79b
tree5b15c3282879c1eb7337087447c35acfc96b70d1
parent2ed44302250bbec1ffe15ff78a0d41c899595ccc
parent2d67b638536d33bd84173238a9c933f04aaed15c
Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
configure.in
configure.in
m4/libevent_openssl.m4
sample/Makefile.am