[tor-commits] [tor/master] Merge remote-tracking branch 'mikeperry-github/bug26259'

[nickm@xxxxxxxxxxxxxx]

commit f399887cfec8ddaf33cac06b2abad25a3d42aac9
Merge: 307008e86 2b734944a
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Jun 8 10:17:00 2018 -0400

    Merge remote-tracking branch 'mikeperry-github/bug26259'

 changes/bug26259          | 4 ++++
 src/or/relay.c            | 2 +-
 src/test/test_relaycell.c | 7 +++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

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