Merge branch 'arthuredelstein_18859+1_031' into maint-0.3.2
commit4b41ffa64d251268602b06552a53da8cbd60af5c
authorNick Mathewson <nickm@torproject.org>
Thu, 7 Dec 2017 13:42:49 +0000 (7 08:42 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 7 Dec 2017 13:42:49 +0000 (7 08:42 -0500)
treeb6781f3b3273a1c4b6eccc243486b0e1c1b12f43
parentd4ca18573ccd0164f4d867e41a8f453119ce421f
parent13049a9866311b30d43b6b8268e57b9631b591f3
Merge branch 'arthuredelstein_18859+1_031' into maint-0.3.2
src/or/circuituse.c