commit 80aca1501ae080ddb9c8f457290226dd5453b08a Merge: d75be18 d850d27 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Jun 5 14:49:46 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9