Merge commit 'karsten/fix-1073' into maint-0.2.1
commitb3991ea7d15c18dc33d4761f61f2e90ad49ab4b8
authorNick Mathewson <nickm@torproject.org>
Thu, 17 Sep 2009 03:36:01 +0000 (16 23:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 17 Sep 2009 03:36:01 +0000 (16 23:36 -0400)
tree7f488d3748de3ef464a7bb52e4c6d01119d1802e
parentdc3229313b6d2aaff437c6fc7fa55ead4409e93d
parentda219ee92445a8defa1ef33ffa2e82b63afe0402
Merge commit 'karsten/fix-1073' into maint-0.2.1
ChangeLog
src/or/rendclient.c