commit 189f357f9790c30e443c6b88ea28eeafbd12abeb Merge: 28b4ab7 985687b Author: Nick Mathewson <nickm at torproject.org> Date: Tue Mar 10 10:10:44 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6'