commit f7151387d937bd1113f4c694b170305d80dde9fa Merge: bc1ea4f47 1deda2106 Author: Nick Mathewson <ni...@torproject.org> Date: Mon Dec 11 16:56:31 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.8
changes/bug24167 | 7 +++++++
src/or/connection.c | 4 ++++
2 files changed, 11 insertions(+)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
