]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'bug12844'
authorNick Mathewson <nickm@torproject.org>
Wed, 11 Feb 2015 20:06:04 +0000 (15:06 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 11 Feb 2015 20:06:04 +0000 (15:06 -0500)
commitcaf28519d9a4f7f0a5fa36a0cd94fe9c0ee292dc
treedb5e6003cc8cec5f27ba0e91449348518ea98455
parent0c81dfa848da160b02818771626a425cd27b86bc
parent0899f51bc6abf535c6c55b81b98b959235b0f7c7
Merge branch 'bug12844'

Conflicts:
src/or/circuituse.c
src/test/include.am
src/test/test_entrynodes.c
doc/tor.1.txt
src/or/circuitbuild.c
src/or/circuitbuild.h
src/or/circuituse.c
src/or/config.c
src/or/or.h
src/or/routerlist.c
src/or/routerlist.h
src/test/include.am
src/test/test_entrynodes.c
src/test/test_hs.c