[tor-commits] [tor/master] Merge branch 'ticket30452_035_v3' into ticket30452_041_v3

2019-05-15 Thread dgoulet
commit 370ea8d23b05fbf725f1474ed734233c3a7197e4 Merge: dd537ba35 0c451b31d Author: Nick Mathewson Date: Tue May 14 19:55:51 2019 -0400 Merge branch 'ticket30452_035_v3' into ticket30452_041_v3 src/app/main/main.c | 1 + 1 file changed, 1 insertion(+)

[tor-commits] [tor/master] Merge branch 'ticket30452_035_v3' into ticket30452_041_v3

2019-05-15 Thread dgoulet
commit 1c95bdb83b1bbbde51b21e30aaed16b406ed7ec5 Merge: 43d411945 1b16fcb70 Author: Nick Mathewson Date: Tue May 14 19:20:53 2019 -0400 Merge branch 'ticket30452_035_v3' into ticket30452_041_v3 changes/bug30452 | 3 +++ doc/tor.1.txt | 4