[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug20270_029'

[nickm@xxxxxxxxxxxxxx]

commit d3a39cf8d0dbc80a1936a0c5391506398828393e
Merge: c83657c ff7e853
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon May 15 10:45:20 2017 -0400

    Merge remote-tracking branch 'public/bug20270_029'

 changes/bug20270 |  6 ++++++
 src/or/dirserv.c | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

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