Commit 57d3413c55689d623dad4eb2765d8a3bed9b586b

Nick Mathewson 2010-09-08T11:39:24

Merge remote branch 'github/globals'