commit 99bf3d8e145b1e68ababa06bd233c2aaba10da95
Merge: a63c5f844 dc5cdde60
Author: George Kadianakis <desnac...@riseup.net>
Date: Wed Jun 5 14:40:38 2019 +0300
Merge branch 'tor-github/pr/1072'
changes/bug29670 | 4 ++++
scripts/maint/practracker/exceptions.txt | 2 +-
src/core/mainloop/connection.c | 33 ++++++++++++++++++++------------
3 files changed, 26 insertions(+), 13 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
