Commit 8d15f57f616bf23c6b20249f1f8777c36b939f40

Nick Mathewson 2014-01-07T16:59:26

Merge remote-tracking branch 'asweeny86/on-complete-cb'