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

[nickm@xxxxxxxxxxxxxx]

commit 12e465344e8b69fd03e76d8247609a378d572006
Merge: 90e7364e7 d3a972561
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed May 16 12:11:45 2018 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug26072 | 5 +++++
 src/or/relay.c   | 1 +
 2 files changed, 6 insertions(+)

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