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

[nickm@xxxxxxxxxxxxxx]

commit bedd32e5d1988409ad431f9191aba7fe818a6767
Merge: 3c0150aa4 735855952
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sat Nov 18 11:03:16 2017 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

 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