Merge branch 'maint-0.2.8' into maint-0.2.9
commiteecfed0cd2c8c92175106e211d1662fa43fc60bc
authorNick Mathewson <nickm@torproject.org>
Mon, 11 Dec 2017 21:56:31 +0000 (11 16:56 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 11 Dec 2017 21:56:31 +0000 (11 16:56 -0500)
treedf98ca388015517b03401b2e51f3476ec8b7f823
parenteaaa1108a3eb1271ad2c8f3fbb8a6845d24de874
parentf7151387d937bd1113f4c694b170305d80dde9fa
Merge branch 'maint-0.2.8' into maint-0.2.9
src/or/connection.c