Merge branch 'maint-0.2.8'
commit51329054199e2b7eb3aed46282028f04e13a13ad
authorNick Mathewson <nickm@torproject.org>
Wed, 24 Aug 2016 14:45:11 +0000 (24 10:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 24 Aug 2016 14:45:11 +0000 (24 10:45 -0400)
tree71ec92073fc80e7d838fe589bc308759f6ad9f3e
parent297635f806ec4244c4e6e6f093f87d647061d42a
parent5280a700aae934753671d26e75050177b510d30d
Merge branch 'maint-0.2.8'
src/or/circuitbuild.c
src/or/or.h
src/or/routerlist.c
src/or/routerlist.h