]> granicus.if.org Git - libevent/commit
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Sat, 22 Sep 2012 23:21:21 +0000 (19:21 -0400)
committerNick Mathewson <nickm@torproject.org>
Sat, 22 Sep 2012 23:21:21 +0000 (19:21 -0400)
commitf2050e79d5140af3c364221bd736727da3d27cbe
tree24a0f680f29450929f361df17418e403227a210a
parent8827dbc3e9f0135d4c88a8ed803c7cabe16f94b8
parent1acf2ebcff7769ce63f4b8dfbcc863a273f75a13
Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
bufferevent_openssl.c
bufferevent_openssl.c