[tor-commits] [tor/master] Merge remote-tracking branch 'linus/bug8532'

[nickm@xxxxxxxxxxxxxx]

commit 45424b2ca1638d5b3d147bb518c092a41028e259
Merge: 4b781e2 c132427
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Jun 13 12:42:49 2013 -0400

    Merge remote-tracking branch 'linus/bug8532'

 changes/bug8532  |    4 ++++
 doc/tor.1.txt    |    4 ++++
 src/or/config.c  |   10 ++++++++++
 src/or/dirserv.c |    3 ++-
 src/or/dirvote.c |   21 ++++++++++++++-------
 src/or/dirvote.h |    8 +++++---
 src/or/main.c    |   14 +++++++++++---
 src/or/or.h      |    4 ++++
 8 files changed, 54 insertions(+), 14 deletions(-)




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits