commit ff1486385aed1172c18a8a593dec2684de891f60 Merge: 4e4b6a247 35b0ac8d8 Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 5 10:14:56 2018 -0400

Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9

.travis.yml | 2 +- changes/bug27418 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)