Commit fe0afabb593c2034965ffd7e9d7ad9c49787f6d6

Nick Mathewson 2012-01-24T10:29:31

Merge remote-tracking branch 'origin/patches-2.0' Conflicts: event.c Edits required in: evmap.c