Commit 33124033fd650a603d64e91151c8faa96adc3f98

Nick Mathewson 2011-06-14T15:15:43

Merge remote-tracking branch 'origin/patches-2.0'