]> granicus.if.org Git - libevent/commit
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 1 May 2012 01:33:56 +0000 (21:33 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 1 May 2012 01:33:56 +0000 (21:33 -0400)
commitb98624ef3503cea3dc3bb3312d10e22127fabb8b
tree1ed2f6c4b1150b082a5c2992055bb4fbb10588eb
parent5859c235de96a8781ad63371d692334b20ecff18
parentb3887cdf3b2ca715a1e496b7dcf2ee583e236338
Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
bufferevent_openssl.c
bufferevent_openssl.c