[tor-commits] [tor/master] Merge branch 'dgoulet_bug22042_031_01_squashed'
nickm at torproject.org
nickm at torproject.org
Mon May 1 20:11:45 UTC 2017
commit 465448e659e6cbaecc1494b5cf270f556e104bd4
Merge: c486ef5 aadb99e
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon May 1 16:08:23 2017 -0400
Merge branch 'dgoulet_bug22042_031_01_squashed'
changes/bug22042 | 5 +++++
src/or/control.c | 40 ++++++++++++++++++++++------------------
src/or/rendclient.c | 6 ++++++
3 files changed, 33 insertions(+), 18 deletions(-)
More information about the tor-commits
mailing list