[tor-commits] [tor/master] Merge branch 'bug11743_option_b'
nickm at torproject.org
nickm at torproject.org
Wed May 7 00:42:38 UTC 2014
commit 5cea500ce75116abe4deb46d759f5ac1048dd4cc
Merge: ed0e2ec 52416f8
Author: Nick Mathewson <nickm at torproject.org>
Date: Tue May 6 20:40:40 2014 -0400
Merge branch 'bug11743_option_b'
changes/bug11743 | 15 +++++++
src/or/dirvote.c | 9 +++-
src/or/dirvote.h | 6 ++-
src/test/test_microdesc.c | 107 +++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 135 insertions(+), 2 deletions(-)
More information about the tor-commits
mailing list