]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'options_validate_second_round_cleaned'
authorNick Mathewson <nickm@torproject.org>
Mon, 1 Feb 2016 14:52:11 +0000 (09:52 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 1 Feb 2016 14:52:11 +0000 (09:52 -0500)

Trivial merge