]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Sun, 11 Sep 2011 20:25:14 +0000 (16:25 -0400)
committerNick Mathewson <nickm@torproject.org>
Sun, 11 Sep 2011 20:25:14 +0000 (16:25 -0400)
1  2 
src/or/or.h
src/or/rendservice.c

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