diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-15 16:43:50 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-15 16:43:50 -0500 |
| commit | 8569166c70f99bf908e78ce272e71eb60cdc84d0 (patch) | |
| tree | 742aa0d959932c9e22cdacbf23e8d700360adbb0 /src/test/include.am | |
| parent | 7f042cbc0a9397c1e5c0f3e9c3bb31ff333d9983 (diff) | |
| parent | 81f4223329a709e5138532b037a58c118b30dd7f (diff) | |
| download | tor-8569166c70f99bf908e78ce272e71eb60cdc84d0.tar.gz tor-8569166c70f99bf908e78ce272e71eb60cdc84d0.zip | |
Merge remote-tracking branch 'public/bug24104_029_squashed' into maint-0.2.9
Resolved conflicts with the 26269 fix in 015fcd0e1191aa6f.
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/include.am b/src/test/include.am index 0ee3d1169f..7864d7d9fd 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -117,6 +117,7 @@ src_test_test_SOURCES = \ src/test/test_relaycell.c \ src/test/test_rendcache.c \ src/test/test_replay.c \ + src/test/test_router.c \ src/test/test_routerkeys.c \ src/test/test_routerlist.c \ src/test/test_routerset.c \ |