]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/920' into maint-0.3.5
authorteor <teor@torproject.org>
Fri, 9 Aug 2019 04:00:01 +0000 (14:00 +1000)
committerteor <teor@torproject.org>
Fri, 9 Aug 2019 04:00:01 +0000 (14:00 +1000)
1  2 
src/core/mainloop/connection.c
src/lib/container/buffers.c

Simple merge
Simple merge