Commit efb644ed87cad093f2b1407bc13648e092367cdc

Nick Mathewson 2012-11-16T10:29:37

Merge remote-tracking branch 'origin/patches-2.0' Conflicts: test/rpcgen_wrapper.sh