commit c281e587bb1b4ac1bdaa97ea68c1ab0c80fe4bab Merge: b169c8c14 30a925fe9 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 15 08:08:41 2019 -0500 Merge branch 'ticket28058_squashed' .travis.yml | 2 ++ Makefile.am | 11 ++++++++++- changes/ticket28058 | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-)