]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Fri, 6 May 2011 01:54:04 +0000 (21:54 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 6 May 2011 01:54:04 +0000 (21:54 -0400)
1  2 
src/common/compat.c
src/or/rendclient.c

Simple merge
Simple merge