commit ca19b2115a761ec37a6af56f6672cc0e16658929 Merge: 20ca62ffb f5d4bdf30 Author: Nick Mathewson <[email protected]> Date: Mon Dec 11 16:53:07 2017 -0500
Merge branch 'maint-0.2.5' into release-0.2.5
changes/ticket23856 | 4 ++++
src/or/rephist.c | 4 ++--
src/or/router.c | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
