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

[nickm@xxxxxxxxxxxxxx]

commit b1c4ab0bec5b2b07e7e5358f449e352bb34c75d0
Merge: 2d849716d 30b322925
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Nov 27 09:09:34 2017 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bastet_v6 | 4 ++++
 src/or/config.c   | 1 +
 2 files changed, 5 insertions(+)




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