]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6747c62 074f248)
Merge branch 'bug21369_check_029_squashed' into maint-0.3.0
authorNick Mathewson <nickm@torproject.org>
Mon, 27 Feb 2017 16:25:34 +0000 (11:25 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 27 Feb 2017 16:25:34 +0000 (11:25 -0500)
1  2 
src/or/buffers.c patch | diff1 | diff2 | blob | history
src/or/dirserv.c patch | diff1 | diff2 | blob | history

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