[tor-commits] [tor/master] Merge remote-tracking branch 'ahf/bugs/22305'

[nickm@xxxxxxxxxxxxxx]

commit d9b14713033e263a8ae008eb6fad580f959bcce3
Merge: 281f06a 9604980
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon May 22 11:57:03 2017 -0400

    Merge remote-tracking branch 'ahf/bugs/22305'

 src/or/directory.c | 13 +++++++++++++
 src/or/directory.h |  1 +
 2 files changed, 14 insertions(+)

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