commit 7df790890593de1cc2aef84305102f80c00bb8f8 Merge: e46849846 0ec72b030 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Sep 18 09:40:09 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.3.0 This is an "ours" merge to avoid the conflict from the 0.2.8 version of the fix for TROVE-2017-008.