Commit 21c962e0877698a8118fe4a68ef0e42905978edf

Nick Mathewson 2012-12-20T11:50:23

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