Commit 6b94ffcec532038cdebacd1e9e78a7a6276ad6a5

Nick Mathewson 2013-04-25T13:54:19

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