commit fc3b90b50471039ebbbb209c88ca89ffc4072e74 Merge: e166b66ec 8ff6ab0a3 Author: teor <teor at torproject.org> Date: Wed Apr 17 16:46:35 2019 +1000 Merge branch 'maint-0.3.5' into release-0.3.5 .travis.yml | 2 +- changes/ticket30117 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)