commit 9bd77019cafcd9b8f4b76c875103093f5b4594e1 Merge: c857276 d21b24b Author: Nick Mathewson <nickm at torproject.org> Date: Mon Feb 24 13:06:40 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.4'