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

[nickm at torproject.org]

commit 523b0ec288ae22d5d6cd448b37cfb5b0f7b71aca
Merge: f2f720a b1447a4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 14 12:40:23 2012 -0400

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

 changes/bug6844   |    4 ++++
 src/common/util.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)