[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug10849_025'

[nickm at torproject.org]

commit 1bbd3811c1c98e6a630ab96f15a376910a576626
Merge: 9da17ad ce450bd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 1 11:51:22 2014 -0400

    Merge remote-tracking branch 'public/bug10849_025'
    
    Conflicts:
    	src/or/config.c

 changes/bug10849_025 |    6 ++++++
 doc/tor.1.txt        |    9 ---------
 src/or/config.c      |   19 ++-----------------
 src/or/directory.c   |    6 +-----
 src/or/entrynodes.c  |    2 +-
 src/or/or.h          |    6 ------
 src/or/routerlist.c  |   17 +++--------------
 7 files changed, 13 insertions(+), 52 deletions(-)