Merge branch 'maint-0.2.7' into maint-0.2.8
commitd3a975ea05bf8d850602a3ad8054402a679c5dcf
authorNick Mathewson <nickm@torproject.org>
Wed, 24 Aug 2016 14:02:52 +0000 (24 10:02 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 24 Aug 2016 14:02:52 +0000 (24 10:02 -0400)
tree9ddc33f52fcfa9da1712659812ab82e38f7f5dc3
parent0ba05313d56e6737c73d003c84eeebdfd0d40398
parentf60da19211fb18f8c7bc6baaa9fa8644ea3a2017
Merge branch 'maint-0.2.7' into maint-0.2.8
src/or/config.c