Commit d430602863ad9ddb911fe52c58ddc842b75ccdb3

Nick Mathewson 2011-12-08T11:43:04

Merge remote-tracking branch 'origin/patches-2.0' Conflicts: configure.in