]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f218a0 0c0214b)
Merge branch 'maint-0.3.5' into maint-0.4.2
authorNick Mathewson <nickm@torproject.org>
Mon, 29 Jun 2020 16:55:35 +0000 (12:55 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 29 Jun 2020 16:55:35 +0000 (12:55 -0400)
1  2 
src/feature/hs/hs_client.c patch | diff1 | diff2 | blob | history

diff --cc src/feature/hs/hs_client.c
Simple merge
Mirror of https://git.torproject.org/tor.git