]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote branch 'public/bug1954' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Mon, 27 Sep 2010 19:39:40 +0000 (15:39 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 27 Sep 2010 19:39:40 +0000 (15:39 -0400)
1  2 
src/common/util.c
src/test/test_util.c

Simple merge
Simple merge