commit d9a70ba21262ee92b53eae791171433e2142a902 Merge: 48bf3aec2 9879eae17 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 11 08:45:25 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1690/head' changes/ticket31576 | 3 +++ contrib/README | 2 +- contrib/dist/rc.subr | 43 ------------------------------------------- contrib/include.am | 1 - 4 files changed, 4 insertions(+), 45 deletions(-)