]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug15515_025'
authorNick Mathewson <nickm@torproject.org>
Wed, 1 Apr 2015 16:59:19 +0000 (12:59 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 1 Apr 2015 16:59:19 +0000 (12:59 -0400)
1  2 
src/or/or.h
src/or/rendmid.c

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