]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'linus/bug8532'
authorNick Mathewson <nickm@torproject.org>
Thu, 13 Jun 2013 16:42:49 +0000 (12:42 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 13 Jun 2013 16:42:49 +0000 (12:42 -0400)
1  2 
src/or/dirserv.c
src/or/or.h

Simple merge
diff --cc src/or/or.h
Simple merge