]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f557a7f 32946e2)
Merge remote-tracking branch 'twstrike/options_test'
authorNick Mathewson <nickm@torproject.org>
Wed, 20 Jan 2016 01:14:18 +0000 (20:14 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 20 Jan 2016 01:14:18 +0000 (20:14 -0500)
1  2 
src/test/test_options.c patch | diff1 | diff2 | blob | history

diff --cc src/test/test_options.c
Simple merge
Mirror of https://git.torproject.org/tor.git