Merge remote-tracking branch 'asweeny86/on-complete-cb'
authorNick Mathewson <nickm@torproject.org>
Tue, 7 Jan 2014 21:59:26 +0000 (16:59 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 7 Jan 2014 21:59:26 +0000 (16:59 -0500)

Trivial merge