]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79a50af 09b9a35)
Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Tue, 2 Jan 2018 15:09:44 +0000 (10:09 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 2 Jan 2018 15:09:44 +0000 (10:09 -0500)
1  2 
src/or/policies.c patch | diff1 | diff2 | blob | history

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