Merge branch 'maint-0.2.9' into maint-0.3.0
commit2d849716df357b570eaf4557638f63a9b2d8a6c1
authorNick Mathewson <nickm@torproject.org>
Sat, 18 Nov 2017 16:02:08 +0000 (18 11:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Sat, 18 Nov 2017 16:02:08 +0000 (18 11:02 -0500)
tree0eb4e91ab45377d0097efef1097fbc50f272071a
parent50fbede4597d143411b3739e88d2c3d8ef457fbd
parent53c3174ee43c3f54f8180be8256180f6f0d24c0d
Merge branch 'maint-0.2.9' into maint-0.3.0
src/or/router.c