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

commit d9b14713033e263a8ae008eb6fad580f959bcce3 Merge: 281f06a 9604980 Author: Nick Mathewson 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] [tor/master] Merge remote-tracking branch 'ahf/bugs/22305'

commit 9a50c731040fea3b85b0c84726d56194993f09e9 Merge: cfe0a45 5a0eab6 Author: Nick Mathewson Date: Mon May 22 10:57:26 2017 -0400 Merge remote-tracking branch 'ahf/bugs/22305' src/or/directory.c | 87 -- src/or/directory.h | 1 + 2 fil