[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm@xxxxxxxxxxxxxx]

commit 66a564fad8a99a21bd6cda6a70982858376b78e9
Merge: ec29cae 66258f8
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Jul 13 16:55:06 2017 -0400

    Merge branch 'maint-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(-)

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