[tor-commits] [tor/master] Merge branch 'bug10881'

[nickm at torproject.org]

commit 5e0cdc5ef254993d9244795eed217ac3eb1f7c24
Merge: cb065a5 0228b9b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 11 11:42:06 2014 -0500

    Merge branch 'bug10881'

 changes/bug10881   |    7 +++++++
 doc/tor.1.txt      |   22 ++++++----------------
 src/or/config.c    |   40 +++++++++++-----------------------------
 src/or/directory.c |   44 --------------------------------------------
 src/or/or.h        |    5 -----
 src/or/router.c    |    3 +--
 6 files changed, 25 insertions(+), 96 deletions(-)