]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'teor/bug18348-v2'
authorNick Mathewson <nickm@torproject.org>
Tue, 23 Feb 2016 12:36:56 +0000 (07:36 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 23 Feb 2016 12:36:56 +0000 (07:36 -0500)
commite88686cb2cbae39333982505f38f2d7568af4f32
tree874f90fe8e155a791d0adec61d52accd3bc073e2
parent48c1c028ca65c9fbdb83f47e5ccda0469b031bdd
parent0ba672a7fdb952c612ee9215bd7e8a6b02f4f8f7
Merge remote-tracking branch 'teor/bug18348-v2'
src/or/directory.c
src/or/or.h
src/or/routerlist.c