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

[nickm@xxxxxxxxxxxxxx]

commit eccef6ba60e59c6d7001d8f6623eb4d01ea8ca11
Merge: 86583ad78 5dc785cee
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sun Feb 11 16:51:56 2018 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug21074_downgrade |  4 ++++
 src/common/compat.c        | 14 +++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

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