]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug6404' into maint-0.2.3
authorNick Mathewson <nickm@torproject.org>
Tue, 21 Aug 2012 14:35:40 +0000 (10:35 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 21 Aug 2012 14:35:40 +0000 (10:35 -0400)
1  2 
src/or/dirvote.c
src/or/routerparse.c

Simple merge
Simple merge