[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit ede9cd4f99e4cd1c0c4bcf1a3ac994e87054cc2d
Merge: dd6a9a9 5939c09
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 24 13:53:17 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'

 changes/msvc_lround |    4 ++++
 src/common/util.c   |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)