[tor-commits] [tor/maint-0.2.2] Merge remote-tracking branch 'public/bug2649_squashed' into maint-0.2.2

[nickm@xxxxxxxxxxxxxx]

commit dfa6cde4d4de57476ea8381199dfbac1afc245d5
Merge: 5f9cdee f45261c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Sep 7 14:43:06 2011 -0400

    Merge remote-tracking branch 'public/bug2649_squashed' into maint-0.2.2

 changes/bug2649a       |    5 +++++
 changes/bug2649b       |    5 +++++
 doc/tor.1.txt          |    7 ++++++-
 src/or/config.c        |    3 ++-
 src/or/dirserv.c       |   16 +++++++++++-----
 src/or/dirvote.h       |    2 +-
 src/or/networkstatus.c |    2 +-
 src/or/or.h            |    3 +++
 8 files changed, 34 insertions(+), 9 deletions(-)

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