commit ac28e56ccb402d640f5adde186a765265ce855c7 Merge: 6d057c56f 57e9fe2bb Author: teor <teor@torproject.org> Date: Mon Apr 1 14:07:58 2019 +1000 Merge branch 'bug29036-029' into bug29036-29962-034 .travis.yml | 8 +++++--- Makefile.am | 4 +++- changes/bug29036 | 5 +++++ 3 files changed, 13 insertions(+), 4 deletions(-)