commit 049e4c8634e7051994f755fc472606b8a5a0a269 Merge: e5a987f 5e0ce4c Author: Nick Mathewson <nickm at torproject.org> Date: Tue Feb 12 10:51:54 2013 -0500 Merge remote-tracking branch 'origin/maint-0.2.3'