Merge remote-tracking branch 'dgoulet/bug27550_033_01' into maint-0.3.3
commit34e4d5a78362b3f133958740a18d0ee06ae4fdad
authorNick Mathewson <nickm@torproject.org>
Thu, 15 Nov 2018 21:37:02 +0000 (15 16:37 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 15 Nov 2018 21:37:02 +0000 (15 16:37 -0500)
treea6354a232ee6be39fc8c12eb1c5581ec944de093
parentdb3acb3aa398bda46435d94427967410da173222
parent18085abfcc3d13c53752764ea87a21201831bc6b
Merge remote-tracking branch 'dgoulet/bug27550_033_01' into maint-0.3.3
src/or/hs_client.c