[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug19066_029_01'

[nickm@xxxxxxxxxxxxxx]

commit 2a884926c04959b11c39e656099f19a55c3a8e95
Merge: 9c7edb0 50ff24e
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon May 23 10:45:13 2016 -0400

    Merge remote-tracking branch 'dgoulet/bug19066_029_01'

 changes/bug19066     | 5 +++++
 src/or/routerparse.c | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)




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