[tor-commits] [tor/master] Merge remote-tracking branch 'catalyst-oniongit/bug23757'

[nickm at torproject.org]

commit 22139c0b285e32639b35d671bef12277d3441791
Merge: d9321d697 3ae5b32aa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 10 14:09:49 2017 -0400

    Merge remote-tracking branch 'catalyst-oniongit/bug23757'

 .gitlab-ci.yml   | 16 ++++++++++------
 changes/bug23757 |  4 ++++
 2 files changed, 14 insertions(+), 6 deletions(-)