]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug23487_029'
authorNick Mathewson <nickm@torproject.org>
Fri, 15 Sep 2017 18:27:58 +0000 (14:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 15 Sep 2017 18:27:58 +0000 (14:27 -0400)
1  2 
src/common/util.c

Simple merge