commit 928235506b1ab6c5f0e92ae1c3606c8d870ec32a
Merge: c0aa7ac 16f337e
Author: Nick Mathewson <[email protected]>
Date: Tue Feb 28 08:20:09 2017 -0500
Merge branch 'maint-0.3.0'
changes/bug21027 | 8 ++++++++
src/or/bridges.c | 27 +++++++++++++++++++++++++++
src/or/bridges.h | 4 ++++
src/or/entrynodes.c | 37 ++++++++++++++++---------------------
4 files changed, 55 insertions(+), 21 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
