diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-08 13:54:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-08 13:54:59 -0400 |
| commit | 4d30dde15670bd4fb572025116304286880db636 (patch) | |
| tree | 7a368ad50ff8949ff106f03012888f0b9f2a5521 /src/or/Makefile.nmake | |
| parent | 35025ee51ff9204271fcfc787a99334082e531a1 (diff) | |
| parent | 9f8e462c89a8320f161f5a77661d573d889651cf (diff) | |
| download | tor-4d30dde15670bd4fb572025116304286880db636.tar.gz tor-4d30dde15670bd4fb572025116304286880db636.zip | |
Merge branch 'netflow_padding-v6-rebased2-squashed'
Diffstat (limited to 'src/or/Makefile.nmake')
| -rw-r--r-- | src/or/Makefile.nmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake index 2ac98cd372..429ae67858 100644 --- a/src/or/Makefile.nmake +++ b/src/or/Makefile.nmake @@ -14,6 +14,7 @@ LIBTOR_OBJECTS = \ addressmap.obj \ buffers.obj \ channel.obj \ + channelpadding.obj \ channeltls.obj \ circpathbias.obj \ circuitbuild.obj \ |