Commit 30f0671526c758772b7d93caf865d75ab1d6698e

Nick Mathewson 2012-04-30T21:45:43

Merge remote-tracking branch 'github/20_active_prio_inv' into patches-2.0