[tor-commits] [tor/master] Merge branch 'tor-github/pr/1292'

[asn@xxxxxxxxxxxxxx]

commit c29f05b159ae51472cd2a183a36cb9d352c082e5
Merge: cdd7e8897 870874fec
Author: George Kadianakis <desnacked@xxxxxxxxxx>
Date:   Thu Sep 5 17:06:58 2019 +0300

    Merge branch 'tor-github/pr/1292'

 changes/ticket31529        |  5 +++++
 src/app/config/confparse.c | 11 ++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits