commit fcec1f338110d17dd23668558a87f0f5ea8a8ee1 Merge: 4c6fd71 54510d4 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 8 14:03:04 2015 -0400

Merge branch 'feature15482_squashed'

changes/feature15482 | 5 +++++ doc/tor.1.txt | 7 ++++++- src/or/circuituse.c | 11 +++++++++-- src/or/config.c | 11 +++++++++++ src/or/or.h | 7 +++++++ 5 files changed, 38 insertions(+), 3 deletions(-)