]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'alec/dead_code_removal'
authorNick Mathewson <nickm@torproject.org>
Sat, 6 Feb 2016 20:08:49 +0000 (15:08 -0500)
committerNick Mathewson <nickm@torproject.org>
Sat, 6 Feb 2016 20:08:49 +0000 (15:08 -0500)

Trivial merge