]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug7950' into maint-0.2.4
authorNick Mathewson <nickm@torproject.org>
Tue, 19 Mar 2013 19:32:17 +0000 (15:32 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 19 Mar 2013 19:32:17 +0000 (15:32 -0400)
1  2 
src/common/util.c
src/common/util.h

Simple merge
Simple merge