commit 5990edd1952361faca4619728b50587061d81be7 Merge: 075482f b4e8d8d Author: Nick Mathewson <nickm at torproject.org> Date: Thu Feb 6 16:29:33 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.4'