[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0

[nickm@xxxxxxxxxxxxxx]

commit ece63105d9157fa432cc59d8b828ca23a80040ff
Merge: 5348c8996 c928fb988
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Nov 13 11:13:22 2017 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket21953 |  6 ++++++
 src/or/main.c       | 10 +++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)




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