Merge branch 'maint-0.2.8'
commit297635f806ec4244c4e6e6f093f87d647061d42a
authorNick Mathewson <nickm@torproject.org>
Wed, 24 Aug 2016 14:03:19 +0000 (24 10:03 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 24 Aug 2016 14:03:19 +0000 (24 10:03 -0400)
treef4ec40f649fe47bcf37daae52df5ddc29c9d65d3
parent8feb301413cc0f23b37dedbac0c57de25b88f519
parentd3a975ea05bf8d850602a3ad8054402a679c5dcf
Merge branch 'maint-0.2.8'
src/or/config.c