[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Merge remote-tracking branch 'andrea/bug18322_v3_squashed'
commit c6846d7bf0d8a382bea17304ea29a51c3a895f90
Merge: a31f55b 13a16e0
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Thu Jun 30 11:18:00 2016 -0400
Merge remote-tracking branch 'andrea/bug18322_v3_squashed'
changes/bug18322 | 4 +
doc/tor.1.txt | 7 +
src/common/testsupport.h | 10 +
src/common/util.c | 28 +-
src/common/util.h | 17 +-
src/or/config.c | 9 +-
src/or/config.h | 8 +-
src/or/main.c | 4 +
src/or/or.h | 5 +
src/or/routerparse.c | 586 +++++++++++++++++++++++++++-
src/or/routerparse.h | 22 ++
src/test/test_dir.c | 990 +++++++++++++++++++++++++++++++++++++++++++++++
12 files changed, 1652 insertions(+), 38 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits