]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 183d0d3 52f61ec)
Merge remote-tracking branch 'tor-github/pr/1829/head' into maint-0.4.3
authorNick Mathewson <nickm@torproject.org>
Mon, 29 Jun 2020 16:56:39 +0000 (12:56 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 29 Jun 2020 16:56:39 +0000 (12:56 -0400)
1  2 
src/app/config/config.c patch | diff1 | diff2 | blob | history
src/test/test_config.c patch | diff1 | diff2 | blob | history

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