]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote branch 'public/pretty-signature-log'
authorNick Mathewson <nickm@torproject.org>
Mon, 13 Sep 2010 19:56:46 +0000 (15:56 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 13 Sep 2010 19:56:46 +0000 (15:56 -0400)
1  2 
src/or/directory.c
src/or/networkstatus.c

Simple merge
Simple merge