commit dde41fa1b00151e01e11341903069f5b2f0db1b7 Merge: 275ab61 5cc155e Author: Nick Mathewson <nickm at torproject.org> Date: Thu Oct 31 16:10:19 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4'