commit 7c411bba8a81b545e377af18ecd47f7de23a2dbc Merge: 72c2292ef 16fd975a8 Author: Nick Mathewson <[email protected]> Date: Fri Jan 5 16:41:34 2018 -0500
Merge branch 'maint-0.3.0' into release-0.3.0
changes/ticket24681 | 6 ++++++
doc/tor.1.txt | 3 ++-
src/or/config.c | 9 ++++++++-
3 files changed, 16 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
