[tor-commits] [tor/master] Merge branch 'bug14013_029_01_squashed'
nickm at torproject.org
nickm at torproject.org
Mon Jun 20 13:46:22 UTC 2016
commit 6cedd4932352929496d8e017500362fafd367f18
Merge: 1160ac1 568dc27
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon Jun 20 08:48:09 2016 -0400
Merge branch 'bug14013_029_01_squashed'
src/common/util_format.c | 18 ++++++++++++------
src/or/circuituse.c | 3 ++-
src/or/config.c | 12 +++++++-----
src/or/control.c | 12 ++++++++----
src/or/directory.c | 19 +++++++++++--------
src/or/dirserv.c | 11 +++++++----
src/or/entrynodes.c | 7 ++++---
src/or/networkstatus.c | 2 +-
src/or/rephist.c | 3 ++-
src/or/routerlist.c | 5 +++--
src/or/routerparse.c | 35 +++++++++++++++++++++--------------
src/test/test_crypto.c | 7 ++++---
src/test/test_dir.c | 2 +-
src/test/test_guardfraction.c | 2 +-
src/test/test_microdesc.c | 3 ++-
src/test/test_ntor_cl.c | 2 +-
src/test/test_util_format.c | 4 ++--
17 files changed, 89 insertions(+), 58 deletions(-)
More information about the tor-commits
mailing list