commit 2c5c17510acf0cbd0eeb874a2f4c62203bf9392f Merge: 67351f672 36ba50650 Author: Nick Mathewson <nickm@torproject.org> Date: Sun Oct 14 15:20:39 2018 -0400 Merge remote-tracking branch 'tor-github/pr/402' .travis.yml | 1 + Makefile.am | 9 +++++++++ changes/ticket28024 | 4 ++++ 3 files changed, 14 insertions(+)