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

[nickm@xxxxxxxxxxxxxx]

commit d2951b381bcbd45798b6cf8f01c5ce7a4d9ad4b9
Merge: 1438c6c71 e88863407
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Apr 24 08:49:24 2018 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug23693.1 |  4 ++++
 src/or/config.c    | 10 +++++++++-
 src/or/main.c      |  2 +-
 src/or/router.c    | 21 ++++++++++++++-------
 4 files changed, 28 insertions(+), 9 deletions(-)




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