Commit 45d6213ef57c946857c48efa70ce33997d890464

Nick Mathewson 2012-03-13T15:56:35

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