]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'github/shrink_or_h_more'
authorNick Mathewson <nickm@torproject.org>
Tue, 3 Jul 2018 15:09:54 +0000 (11:09 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 3 Jul 2018 15:09:54 +0000 (11:09 -0400)

Trivial merge