commit defe541a3084532eb34bab82341752323cf7efca Merge: 2d83770 411c622 Author: Nick Mathewson <nickm at torproject.org> Date: Wed May 7 23:12:51 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4'