commit 2b1b1def46395de573902169404238d38ce3070e Merge: ba7b624 4d0ad34 Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 29 09:48:02 2014 -0400

Merge remote-tracking branch 'teor/circuitstats-pareto-avoid-div-zero'

changes/bug13290-avoid-div-zero-circuitstatus-pareto | 5 +++++ src/or/circuitstats.c | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-)