]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'precommit_squashed'
authorNick Mathewson <nickm@torproject.org>
Thu, 24 Jan 2019 16:08:10 +0000 (11:08 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 24 Jan 2019 16:08:10 +0000 (11:08 -0500)

Trivial merge