[tor-commits] [tor/master] Merge remote-tracking branch 'catalyst-github/moar-libs'

[nickm at torproject.org]

commit d6aa6549b54a52e7c67d0f1409a3696af450f341
Merge: d88ce331e f028713d3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 2 12:22:37 2018 -0400

    Merge remote-tracking branch 'catalyst-github/moar-libs'

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