[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
nickm at torproject.org
nickm at torproject.org
Tue Sep 11 17:22:47 UTC 2012
commit f8a665c87d21b3bf4325c0c7f369b4ec3fbedd98
Merge: 99cb969 5833861
Author: Nick Mathewson <nickm at torproject.org>
Date: Tue Sep 11 13:21:20 2012 -0400
Merge remote-tracking branch 'origin/maint-0.2.3'
changes/bug6811 | 5 +++++
src/common/util.c | 27 +++++++++++++--------------
src/common/util.h | 2 +-
src/or/directory.c | 3 ++-
src/or/dirvote.c | 6 ++++--
src/test/test_util.c | 13 +++++++++++++
6 files changed, 38 insertions(+), 18 deletions(-)
More information about the tor-commits
mailing list