[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

[nickm at torproject.org]

commit ade9204fc18058f0ce35e1533d474baeaf17862e
Merge: 0917f621e 9d9e71824
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 14 14:02:42 2019 -0500

    Merge branch 'maint-0.3.5' into release-0.3.5

 changes/bug28920            |  6 ++++++
 src/feature/stats/rephist.c | 35 +++++++++++++++++------------------
 2 files changed, 23 insertions(+), 18 deletions(-)