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

[nickm@xxxxxxxxxxxxxx]

commit b8dedaee743c7368664d63a77167b3ba82ff0b81
Merge: 578eead1c df57d1e0c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Oct 23 08:59:11 2017 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/longclaw_23592 | 3 +++
 src/or/config.c        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

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