[tor-commits] [tor/master] Merge remote-tracking branch 'tlyu-github/bug28929'

[nickm@xxxxxxxxxxxxxx]

commit 7a7685955ec9ba464aee0ad67523219c3ad70f84
Merge: fe26e1f1c 7e7531171
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jan 7 08:46:27 2019 -0500

    Merge remote-tracking branch 'tlyu-github/bug28929'

 src/feature/control/control_bootstrap.c | 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