Merge remote-tracking branch 'sourceforge/patches-2.0' into patches-2.0
authorNick Mathewson <nickm@torproject.org>
Fri, 20 Dec 2013 18:37:04 +0000 (13:37 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 20 Dec 2013 18:37:04 +0000 (13:37 -0500)
commiteaa79cd45954cdb4c10c4def1339c25c429b1fd9
tree7a904a5997c3e6fc4bbc55c520971e8bad09ef94
parent8cd695bf6dbe891c0e23589ca691891e5b76083d
parentcec62cb80a689f84470f8424ed70d39e8854f981
Merge remote-tracking branch 'sourceforge/patches-2.0' into patches-2.0

Conflicts:
include/event2/event.h
include/event2/event.h