commit af0fdb85e9f3404b735f6fbdb3fd3aa67758eb17 Merge: fd8f21e fed78bc Author: Nick Mathewson <nickm at torproject.org> Date: Mon Oct 20 10:31:20 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5