[tor-commits] [tor/master] Merge remote-tracking branch 'linus/empty_desc_stats'

[nickm at torproject.org]

commit 545cb5f34ea5eba4209650833634611160ab7389
Merge: f348daa d2cf90d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 30 10:06:21 2012 -0400

    Merge remote-tracking branch 'linus/empty_desc_stats'

 changes/bug5508  |    4 ++++
 src/or/rephist.c |    2 ++
 2 files changed, 6 insertions(+), 0 deletions(-)