16 Feb
2018
16 Feb
'18
2:05 a.m.
commit b56fd17d0003b0b66570a7d99aadbe901144f75d Merge: d9804691d d662d4470 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 15 21:05:12 2018 -0500
Merge branch 'maint-0.3.3'
changes/ticket24343 | 6 ++++++ doc/tor.1.txt | 8 ++++---- src/or/config.c | 5 +++-- src/or/connection.c | 2 -- src/or/main.c | 2 +- src/or/or.h | 5 +---- 6 files changed, 15 insertions(+), 13 deletions(-)