]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'bug17150_027_extra' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Tue, 17 May 2016 23:47:22 +0000 (19:47 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 17 May 2016 23:47:22 +0000 (19:47 -0400)
commit3f49474349538be499ab485c697c147c8829fa0d
tree060784f765cd523151958a0c0ef34064f17ee407
parentd6a2fec05ebcc39773a2f6666e1378410c64f047
parent00f74e0372a956f9db590e1cb2ddcfb265125023
Merge branch 'bug17150_027_extra' into maint-0.2.8
src/or/dirserv.c
src/or/or.h
src/or/router.c
src/or/routerlist.c
src/or/routerlist.h
src/or/routerparse.c