Merge remote-tracking branch 'origin/maint-0.2.2'
commitf0589da0e3270e627ac6fd249976234a4c085d3f
authorNick Mathewson <nickm@torproject.org>
Wed, 9 Nov 2011 16:04:40 +0000 (9 11:04 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 9 Nov 2011 16:04:40 +0000 (9 11:04 -0500)
tree017bef7fbe0ae7c715c246ae22d74f801ae76c8a
parent9452b65680deee698dbc8c4eae929aba3b75b198
parent8adec8705014ef7e788a1dcf5d3a4a2d85a328ed
Merge remote-tracking branch 'origin/maint-0.2.2'
src/or/rendservice.c