[tor-commits] [tor/master] Merge remote-tracking branch 'neel/b21530'

[nickm@xxxxxxxxxxxxxx]

commit 12320e7f3ed181f8eb0af4b02507ac3abb7fe6ea
Merge: 0582f678e 2c093c96b
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Sep 14 09:27:03 2018 -0400

    Merge remote-tracking branch 'neel/b21530'

 changes/bug21530       |  7 +++++++
 src/core/or/policies.c | 44 +++++++++++++++-----------------------------
 2 files changed, 22 insertions(+), 29 deletions(-)




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