commit 3a7e2ce1b68fcd69fd2eb4d5cde1f153885f799f Merge: 4c21daa9e f5092e711 Author: Nick Mathewson <ni...@torproject.org> Date: Fri Sep 8 08:24:47 2017 -0400
Merge branch 'maint-0.3.0' into release-0.3.0
changes/bug22644 | 5 +++++
src/or/control.c | 16 ++++++++++++----
2 files changed, 17 insertions(+), 4 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
