]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch '13605_reduced_exit_squashed'
authorNick Mathewson <nickm@torproject.org>
Tue, 31 Oct 2017 17:37:39 +0000 (13:37 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 31 Oct 2017 17:37:39 +0000 (13:37 -0400)

Trivial merge