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

[nickm@xxxxxxxxxxxxxx]

commit c93ecb8189773e06fa3635fff8184024c6c6e0fa
Merge: 783e458c0 1db5081ba
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Oct 23 09:06:34 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket23910 | 3 +++
 src/or/config.c     | 3 +++
 2 files changed, 6 insertions(+)

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