commit 8e100d1a17d497d99c10c13db53442ff9e56063f parent 5c03bb7c0ca55a17dae64d4a9d05dd88b3d712c8 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 11 Dec 2017 16:43:24 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid taking the 030 version of 23862.