commit 1728801bbc42f45e561812d8655b7f46fc740ea8
Merge: a4669d8 676f710
Author: Nick Mathewson <[email protected]>
Date: Fri Aug 17 12:34:52 2012 -0400
Merge remote-tracking branch 'origin/maint-0.2.3'
changes/bug6507 | 15 +++++
src/or/config.c | 161 ++++++++++++++++++++++++++++++++++----------------
src/or/directory.c | 2 +-
src/or/directory.h | 2 +-
src/or/dirserv.c | 12 ++--
src/or/or.h | 35 +++++++++--
src/or/router.c | 5 +-
src/or/routerparse.c | 2 +-
8 files changed, 164 insertions(+), 70 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
