Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Tue, 24 Jan 2012 15:29:31 +0000 (10:29 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 24 Jan 2012 15:29:31 +0000 (10:29 -0500)
commitfe0afabb593c2034965ffd7e9d7ad9c49787f6d6
tree5f11d6f150121e69c2b1cdbd6b3457af7224c126
parent40a3c52d05cbf9a57c8ed595cb8a546e66dd13e4
parent3f18ad1b5f9ca180337fa3d348fe9100d4a0a9b0
Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
event.c

Edits required in:
        evmap.c
event-internal.h
event.c
evmap.c
test/regress.c
test/regress_main.c