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

[nickm@xxxxxxxxxxxxxx]

commit 2d849716df357b570eaf4557638f63a9b2d8a6c1
Merge: 50fbede45 53c3174ee
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sat Nov 18 11:02:08 2017 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug18329-minimal | 6 ++++++
 src/or/router.c          | 9 +++++++++
 2 files changed, 15 insertions(+)




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