]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'hiro/gitlab-ci'
authorNick Mathewson <nickm@torproject.org>
Tue, 19 Sep 2017 17:43:53 +0000 (13:43 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 19 Sep 2017 17:43:53 +0000 (13:43 -0400)

Trivial merge