]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'public/bug24104_029_squashed' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Thu, 15 Nov 2018 21:43:50 +0000 (16:43 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 15 Nov 2018 21:43:50 +0000 (16:43 -0500)
commit8569166c70f99bf908e78ce272e71eb60cdc84d0
tree742aa0d959932c9e22cdacbf23e8d700360adbb0
parent7f042cbc0a9397c1e5c0f3e9c3bb31ff333d9983
parent81f4223329a709e5138532b037a58c118b30dd7f
Merge remote-tracking branch 'public/bug24104_029_squashed' into maint-0.2.9

Resolved conflicts with the 26269 fix in 015fcd0e1191aa6f.
src/or/router.c
src/test/test.c