]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/920' into maint-0.4.0
authorteor <teor@torproject.org>
Wed, 10 Apr 2019 08:26:49 +0000 (18:26 +1000)
committerteor <teor@torproject.org>
Wed, 10 Apr 2019 08:26:49 +0000 (18:26 +1000)
1  2 
src/core/mainloop/connection.c
src/lib/buf/buffers.c

Simple merge
Simple merge