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

[nickm@xxxxxxxxxxxxxx]

commit 5355b99dc0f9e4c69213dc3db244c01b65e80384
Merge: 5c9841166 91188540a
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Nov 13 11:18:02 2017 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug23470   |  6 ++++++
 src/or/directory.c | 22 +++++++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)

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