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

[nickm@xxxxxxxxxxxxxx]

commit 17a923941a41d9283cad0cb093024c872fafdb0a
Merge: 91109bc81 e658dad62
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 13 08:50:58 2018 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/ticket25170 |  5 +++++
 src/or/dirserv.c    | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)




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