]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.3.3'
authorNick Mathewson <nickm@torproject.org>
Tue, 17 Apr 2018 14:45:58 +0000 (10:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 17 Apr 2018 14:45:58 +0000 (10:45 -0400)
1  2 
src/or/relay.c
src/or/relay.h

diff --cc src/or/relay.c
Simple merge
diff --cc src/or/relay.h
Simple merge