commit def0cac3ee229b65ede6e5bfecf0326cdeca02df Merge: cce06b6 9077118 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Mar 11 11:23:46 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4'