commit 67709398b6bb1cea68b8c2a0060b251e8dfa86ee
Merge: 41cff47 5959d1c
Author: Nick Mathewson <[email protected]>
Date: Mon Mar 18 15:18:56 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug8273 | 3 +
changes/bug8435 | 4 +
src/or/config.c | 1 +
src/or/dirserv.c | 288 ++++++++++++++++++++++++++++++++++++++++++++++++---
src/or/dirserv.h | 13 +++
src/or/or.h | 4 +
src/test/test_dir.c | 78 ++++++++++++++
7 files changed, 375 insertions(+), 16 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
