commit 51df1f9906510521d1641841d6687e1ab700800a Merge: fec73c8 51e3602 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Feb 24 13:25:32 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6