]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'weasel/bug18458'
authorNick Mathewson <nickm@torproject.org>
Tue, 15 Mar 2016 13:18:24 +0000 (09:18 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 15 Mar 2016 13:18:24 +0000 (09:18 -0400)
1  2 
src/common/util.c
src/or/config.c

Simple merge
diff --cc src/or/config.c
Simple merge