Merge remote-tracking branch 'rransom/bug2748-v2' into maint-0.2.2
commitde069f5ea73a4fe841df27d85c28c0d79ad2c13e
authorNick Mathewson <nickm@torproject.org>
Fri, 3 Jun 2011 15:16:48 +0000 (3 11:16 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 3 Jun 2011 15:16:48 +0000 (3 11:16 -0400)
tree4819f3b90fe804228d83d0de1de92c1acbf4f60f
parentb79d50dfcc77013329b2fbfd4a84af29a5965b27
parent96b929e743dc68f706f374c3448ed27c54a9cead
Merge remote-tracking branch 'rransom/bug2748-v2' into maint-0.2.2
src/or/rendcommon.c