commit 7fea2c3188d81cd19ad2d1bd3d79099b88c9cd9d Merge: b658893 f602172 Author: Nick Mathewson <nickm at torproject.org> Date: Wed Dec 7 18:28:48 2016 -0500 Merge branch 'maint-0.2.9'