[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

[nickm at torproject.org]

commit 691dec5d4615dec9a845d0f7dea7ef55cc66fe62
Merge: 99947c3ce 9d9e71824
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 14 14:02:42 2019 -0500

    Merge branch 'maint-0.3.5'

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