12 Sep
2017
12 Sep
'17
2:43 p.m.
commit 26d462c1f0d4dd7ebd7f3f24c49a26e62e279b93 Merge: 4027bd2e9 27fa4a98d Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 12 10:43:34 2017 -0400
Merge branch 'ticket21031'
changes/ticket21031 | 5 +++++ doc/tor.1.txt | 15 ++++++++------- src/or/config.c | 9 +++++---- src/or/connection_edge.c | 2 +- src/or/or.h | 2 +- src/or/relay.c | 6 +++--- src/test/test_relaycell.c | 4 ++-- 7 files changed, 25 insertions(+), 18 deletions(-)