commit 7295ad18d5c7ca67f6eee6d71823fc071103b795 Merge: 0be2934 335ff91 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Jul 5 16:01:12 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2'