commit 7d410a6b0d462e0838c5fca2eec089693104a514 Merge: e2ede7c 57ba7ab Author: Nick Mathewson <nickm at torproject.org> Date: Wed Aug 24 11:02:10 2016 -0400 Merge branch 'maint-0.2.8'