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

[nickm at torproject.org]

commit d9321d697d8ac01284a07ac9651bbfa4030f96e6
Merge: 51e47481f d5d811e2d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 10 14:07:34 2017 -0400

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

 .gitlab-ci.yml   | 4 +++-
 changes/bug23755 | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)