[tor-commits] [tor/master] Merge branch 'cid30_changelog' into maint-0.2.2

[nickm at torproject.org]

commit 5cf725e3c691ac3e5674ce64bd2be410a9cb0ede
Merge: 2ba19f9 359a30d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 1 12:55:27 2011 -0400

    Merge branch 'cid30_changelog' into maint-0.2.2

 changes/memleak_rendcache |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)