[tor-commits] [tor/master] Merge branch 'arma_bug22212_031'

[nickm@xxxxxxxxxxxxxx]

commit a384937f848dc2e7b45c4b4be49467eac2a2db19
Merge: 87db5a6b7 5a1e0bfcd
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 6 11:41:52 2018 -0500

    Merge branch 'arma_bug22212_031'

 changes/bug22212-forreal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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