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

[nickm@xxxxxxxxxxxxxx]

commit 473725a63d92fc4ef3aabd18d25fd54d53439959
Merge: 3ccd1c0da eaaa1108a
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Dec 11 16:54:14 2017 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/ticket23856 | 4 ++++
 src/or/rephist.c    | 4 ++--
 src/or/router.c     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

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