commit f1707f7db3296e5ddae2f09ff269afdebf651ec4 Merge: d475d7c2f 7c92f4faa Author: Nick Mathewson <nickm@torproject.org> Date: Sat Aug 24 16:29:23 2019 -0400 Merge branch 'maint-0.4.1' .travis.yml | 2 +- changes/bug31463 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)