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

[nickm@xxxxxxxxxxxxxx]

commit 9092e9019a111608b34dd6594d599d4ca464c36d
Merge: ece63105d 666653758
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Nov 13 11:15:50 2017 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug8185_025 |  6 ++++++
 src/or/relay.c      | 11 +++++++++++
 2 files changed, 17 insertions(+)




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