[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'dgoulet/bug25226_033_02' into maint-0.3.3

nickm at torproject.org nickm at torproject.org
Mon Apr 16 14:06:26 UTC 2018


commit 22845df2a7503ed73ed325c3a98916f289918caa
Merge: 3ee4c9b1f d064122e7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 16 10:04:36 2018 -0400

    Merge remote-tracking branch 'dgoulet/bug25226_033_02' into maint-0.3.3

 changes/bug25226       |  4 +++
 src/or/networkstatus.c |  1 +
 src/or/or.h            |  6 -----
 src/or/relay.c         | 67 +++++++++++++++++++++++++++++++++++++++++++++++---
 src/or/relay.h         |  1 +
 5 files changed, 70 insertions(+), 9 deletions(-)



More information about the tor-commits mailing list