commit 7c54d2f3f0bcf483fd14dedb1a5dcbece6976411 Merge: 578a439 80aca15 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Jun 5 14:49:46 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0