commit f50363e37ab33665647f6f390ee20f99e9a43070
Merge: 0c0f8ad a06c465
Author: Nick Mathewson <[email protected]>
Date: Mon Apr 3 09:29:04 2017 -0400
Merge branch 'maint-0.3.0' into release-0.3.0
changes/bug21596 | 5 +++++
src/or/bridges.c | 4 ++--
src/or/entrynodes.c | 9 +--------
src/or/rendservice.c | 10 +++++-----
4 files changed, 13 insertions(+), 15 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
