[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/595'

[nickm at torproject.org]

commit a3e6f2467b55bdd122ef764a7d23e040c6395fb8
Merge: 872998dd0 06046c726
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 18 13:51:21 2018 -0500

    Merge remote-tracking branch 'tor-github/pr/595'

 changes/ticket28840     | 3 +++
 src/app/config/config.c | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)