]> granicus.if.org Git - libevent/commit
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 1 May 2012 02:00:05 +0000 (22:00 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 1 May 2012 02:00:05 +0000 (22:00 -0400)
commit2e882a071b51cb79d56dddaa54e8fbac1117664f
tree8c5ab3d9d028ddfb28a5342d408e342429e614b1
parentb98624ef3503cea3dc3bb3312d10e22127fabb8b
parent30f0671526c758772b7d93caf865d75ab1d6698e
Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
event.c
event-internal.h
event.c
test/regress.c