commit 7a606004111d8d12d4d90b26697bc9bab02b0227
Merge: c8c258a43 525c1c493
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu Jan 11 08:31:25 2018 -0500
Merge remote-tracking branch 'ffmancera/github/bug24573'
changes/ticket24573 | 7 +++++++
src/or/bridges.c | 59 +++++++++++++++++++++++++++++++++++++++++++++--------
2 files changed, 57 insertions(+), 9 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
