[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/957' into maint-0.2.9

[teor at torproject.org]

commit 05018d55cabdf9c0f80d6bf78ca30c795b60500e
Merge: 2bc8989d8 031ed59db
Author: teor <teor at torproject.org>
Date:   Fri Aug 9 13:50:42 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/957' into maint-0.2.9

 src/or/rephist.h      | 4 +---
 src/test/test_relay.c | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)