]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ae67fe 1b9e773)
Merge remote-tracking branch 'tor-github/pr/726' into maint-0.3.5
authorteor <teor@torproject.org>
Fri, 19 Apr 2019 01:51:05 +0000 (11:51 +1000)
committerteor <teor@torproject.org>
Fri, 19 Apr 2019 01:51:05 +0000 (11:51 +1000)
1  2 
src/app/config/config.c patch | diff1 | diff2 | blob | history

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