commit 640b4022324c19cf330a26b8d42b6bf7707346ce Merge: 34fdd51 053e11f Author: Nick Mathewson <nickm at torproject.org> Date: Tue Feb 7 08:32:10 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5