commit a6180b7f290c52b03f8abe3caf2ce233399dd66f
Merge: cb01aae bf92525
Author: Nick Mathewson <[email protected]>
Date: Mon Jun 11 10:14:01 2012 -0400
Merge branch 'bug6097'
changes/bug5909 | 5 +++++
changes/fix_unicode | 3 +++
src/common/compat.c | 23 ++++++++++++++++-------
src/common/util.c | 7 ++++---
src/or/config.c | 5 +++--
src/or/eventdns.c | 3 ++-
src/or/ntmain.c | 3 ++-
src/test/test.c | 2 +-
src/test/test_util.c | 6 +++++-
9 files changed, 41 insertions(+), 16 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
