]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.5' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Wed, 5 Jul 2017 17:42:32 +0000 (13:42 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 5 Jul 2017 17:42:32 +0000 (13:42 -0400)
1  2 
src/common/compat.c
src/test/test_addr.c

Simple merge
Simple merge