commit 963324cf2accfc424df5fde902299449abf9093c Merge: f7503fb 3483f7c Author: Nick Mathewson <ni...@torproject.org> Date: Tue Jun 27 11:04:44 2017 -0400
Merge branch 'maint-0.2.8' into release-0.2.8
changes/bug22737 | 12 ++++++++++++
src/or/connection_or.c | 4 +++-
2 files changed, 15 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
