-
- Downloads
Merge remote-tracking branch 'public/split_entry_conn'
Conflicts: src/or/connection.c src/or/connection_edge.c src/or/connection_edge.h src/or/dnsserv.c Some of these were a little tricky, since they touched code that changed because of the prop171 fixes.
No related branches found
No related tags found
Showing
- src/or/circuitbuild.c 10 additions, 5 deletionssrc/or/circuitbuild.c
- src/or/circuituse.c 54 additions, 45 deletionssrc/or/circuituse.c
- src/or/circuituse.h 3 additions, 3 deletionssrc/or/circuituse.h
- src/or/connection.c 64 additions, 42 deletionssrc/or/connection.c
- src/or/connection.h 1 addition, 0 deletionssrc/or/connection.h
- src/or/connection_edge.c 214 additions, 199 deletionssrc/or/connection_edge.c
- src/or/connection_edge.h 15 additions, 14 deletionssrc/or/connection_edge.h
- src/or/control.c 33 additions, 31 deletionssrc/or/control.c
- src/or/control.h 1 addition, 1 deletionsrc/or/control.h
- src/or/directory.c 5 additions, 4 deletionssrc/or/directory.c
- src/or/dnsserv.c 32 additions, 28 deletionssrc/or/dnsserv.c
- src/or/dnsserv.h 2 additions, 2 deletionssrc/or/dnsserv.h
- src/or/hibernate.c 1 addition, 1 deletionsrc/or/hibernate.c
- src/or/main.c 4 additions, 4 deletionssrc/or/main.c
- src/or/or.h 69 additions, 35 deletionssrc/or/or.h
- src/or/relay.c 59 additions, 43 deletionssrc/or/relay.c
- src/or/rendclient.c 18 additions, 16 deletionssrc/or/rendclient.c
Loading
Please register or sign in to comment