]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d748c19 1722232)
Merge remote-tracking branch 'twstrike/options_test'
authorNick Mathewson <nickm@torproject.org>
Fri, 15 Jan 2016 15:52:27 +0000 (10:52 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 15 Jan 2016 15:52:27 +0000 (10:52 -0500)

Trivial merge
Mirror of https://git.torproject.org/tor.git