commit 7df790890593de1cc2aef84305102f80c00bb8f8 parent e468498469ebb2a676e74884a34fa017fa8ac3a4 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 18 Sep 2017 09:40:09 -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.
