commit 6cfbaed3a59b4568a1d922df15f041a18789058e Merge: 632d006 86d5a6f Author: Nick Mathewson <nickm at torproject.org> Date: Tue Feb 7 09:30:33 2017 -0500 Merge branch 'maint-0.2.7' into release-0.2.7