[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm at torproject.org]

commit 05ca8ab5b69cb51e708e74ddeb32188f5f169ca3
Merge: 11b2d36 66258f8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 13 16:55:06 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug22883-config |  7 +++++++
 doc/tor.1.txt           | 10 ++++++++++
 src/or/config.c         |  1 +
 src/or/consdiffmgr.c    | 13 ++++++++++++-
 src/or/or.h             |  5 +++++
 5 files changed, 35 insertions(+), 1 deletion(-)