Commit e0aa08666eecdab5467770ed0753f1f330ced76e

Nick Mathewson 2012-05-03T12:21:57

Merge remote-tracking branch 'github/patches-2.0' Conflicts: test/regress.c