]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug7816_024'
authorNick Mathewson <nickm@torproject.org>
Thu, 7 Feb 2013 20:13:21 +0000 (15:13 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 7 Feb 2013 20:13:21 +0000 (15:13 -0500)
1  2 
src/or/dirvote.c
src/or/router.c

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