]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1cf11b6 a2aaf95)
Merge branch 'maint-0.2.9' into maint-0.3.0 maint-0.3.0
authorNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 21:29:43 +0000 (16:29 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 21:29:43 +0000 (16:29 -0500)
 Conflicts:
        src/or/rendservice.c

1  2 
src/or/rendservice.c patch | diff1 | diff2 | blob | history

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