commit 9e44273a4a22803eff900f6df10f13c7548bdb0d Author: Roger Dingledine arma@torproject.org Date: Wed May 11 16:15:37 2016 -0400

fix 'make dist' which was broken by ticket 18365's merge --- src/ext/include.am | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/ext/include.am b/src/ext/include.am index d1a3b47..708f550 100644 --- a/src/ext/include.am +++ b/src/ext/include.am @@ -153,20 +153,20 @@ LIBKECCAK_TINY=src/ext/keccak-tiny/libkeccak-tiny.a noinst_LIBRARIES += $(LIBKECCAK_TINY)

EXTRA_DIST += \ - timeouts/bench/bench-add.lua \ - timeouts/bench/bench-aux.lua \ - timeouts/bench/bench.c \ - timeouts/bench/bench-del.lua \ - timeouts/bench/bench-expire.lua \ - timeouts/bench/bench.h \ - timeouts/bench/bench-heap.c \ - timeouts/bench/bench-llrb.c \ - timeouts/bench/bench.plt \ - timeouts/bench/bench-wheel.c \ - timeouts/bench/Rules.mk \ - timeouts/lua/Rules.mk \ - timeouts/lua/timeout-lua.c \ - timeouts/Makefile \ - timeouts/Rules.shrc \ - timeouts/test-timeout.c + src/ext/timeouts/bench/bench-add.lua \ + src/ext/timeouts/bench/bench-aux.lua \ + src/ext/timeouts/bench/bench.c \ + src/ext/timeouts/bench/bench-del.lua \ + src/ext/timeouts/bench/bench-expire.lua \ + src/ext/timeouts/bench/bench.h \ + src/ext/timeouts/bench/bench-heap.c \ + src/ext/timeouts/bench/bench-llrb.c \ + src/ext/timeouts/bench/bench.plt \ + src/ext/timeouts/bench/bench-wheel.c \ + src/ext/timeouts/bench/Rules.mk \ + src/ext/timeouts/lua/Rules.mk \ + src/ext/timeouts/lua/timeout-lua.c \ + src/ext/timeouts/Makefile \ + src/ext/timeouts/Rules.shrc \ + src/ext/timeouts/test-timeout.c