]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug11469_024'
authorNick Mathewson <nickm@torproject.org>
Thu, 15 May 2014 17:35:08 +0000 (13:35 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 15 May 2014 17:35:08 +0000 (13:35 -0400)
1  2 
src/or/directory.c

Simple merge