commit 3bca705c544bd56ade5a25022b51d395f038444f Merge: 6e3ec8222 953a8f851 Author: Nick Mathewson <ni...@torproject.org> Date: Fri Dec 1 12:13:40 2017 -0500
Merge branch 'maint-0.2.9' into maint-0.3.0
changes/bug24480 | 3 +++
src/or/rendservice.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
