Merge branch 'maint-0.2.8' into maint-0.2.9
commit2c93be80d9ad0712b5716c85e32f7a5184f3b1d2
authorNick Mathewson <nickm@torproject.org>
Wed, 20 Sep 2017 12:32:55 +0000 (20 08:32 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 20 Sep 2017 12:32:55 +0000 (20 08:32 -0400)
tree856cf5eafc4973e717f758c6e247b7278381e1fe
parent42e12a3537fef04ab77defd6cb5581add439de43
parent8e52c46581ca8279c0f132a822e06f10e5f4676d
Merge branch 'maint-0.2.8' into maint-0.2.9
src/or/config.c