]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Thu, 5 May 2011 03:29:56 +0000 (23:29 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 5 May 2011 03:29:56 +0000 (23:29 -0400)
1  2 
src/or/dirserv.c
src/or/dirvote.c

Simple merge
Simple merge