Merge branch 'maint-0.4.0' into maint-0.4.1
commitcec42be570fcbbfbc5971e0ceba21e8eadd32d21
authorNick Mathewson <nickm@torproject.org>
Tue, 17 Sep 2019 22:56:52 +0000 (17 18:56 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 17 Sep 2019 22:56:52 +0000 (17 18:56 -0400)
tree7437bf95e446fa1a1f24241723993d0bf59b97dd
parentab74c3560a423227fff337b1033716920920603b
parent34bab120df213970edf32db1f3462ff2585ee098
Merge branch 'maint-0.4.0' into maint-0.4.1
src/core/or/connection_edge.c