]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/autodetect-chutney-path'
authorNick Mathewson <nickm@torproject.org>
Wed, 2 Sep 2015 13:17:24 +0000 (09:17 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 2 Sep 2015 13:17:24 +0000 (09:17 -0400)

Trivial merge