]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug13214_025_squashed'
authorNick Mathewson <nickm@torproject.org>
Tue, 4 Nov 2014 05:24:56 +0000 (00:24 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 4 Nov 2014 05:24:56 +0000 (00:24 -0500)
1  2 
src/or/directory.c
src/or/rendcommon.c
src/or/rendcommon.h

Simple merge
Simple merge
Simple merge