[tor-commits] [tor/master] Merge branch 'bug1376'
nickm at torproject.org
nickm at torproject.org
Fri Oct 11 16:51:59 UTC 2013
commit 0546edde66b3ca3dfbbd51f95b906d9e8f4f1459
Merge: 6f9584b 7ef9ecf
Author: Nick Mathewson <nickm at torproject.org>
Date: Fri Oct 11 12:51:15 2013 -0400
Merge branch 'bug1376'
changes/bug1376 | 4 ++
src/common/util.c | 14 +++++--
src/common/util.h | 2 +-
src/or/dirvote.c | 2 +-
src/or/routerlist.c | 4 +-
src/test/test_util.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 126 insertions(+), 7 deletions(-)
More information about the tor-commits
mailing list