]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'post-refactor-renaming'
authorNick Mathewson <nickm@torproject.org>
Tue, 10 Jul 2018 19:35:49 +0000 (15:35 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 10 Jul 2018 19:35:49 +0000 (15:35 -0400)

Trivial merge