diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-07-18 08:48:20 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-18 08:48:20 -0400 |
| commit | d7ccb6a3b1d6f2884bdcd6ff60cddbd826f6e0eb (patch) | |
| tree | 7564d54e23fe600e3321aa5c37ffecd0e057c400 /src/or/transports.h | |
| parent | b551988ef46ac29427a3bd8d8a76965b190623ab (diff) | |
| parent | e02b6b99f243566e1e652068af0d0b712b37914e (diff) | |
| download | tor-d7ccb6a3b1d6f2884bdcd6ff60cddbd826f6e0eb.tar.gz tor-d7ccb6a3b1d6f2884bdcd6ff60cddbd826f6e0eb.zip | |
Merge branch 'bug8978_rebase_2'
Conflicts:
src/test/test_pt.c
Diffstat (limited to 'src/or/transports.h')
| -rw-r--r-- | src/or/transports.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/transports.h b/src/or/transports.h index dc68e946f2..126b7046a6 100644 --- a/src/or/transports.h +++ b/src/or/transports.h @@ -25,6 +25,9 @@ typedef struct transport_t { /** Boolean: We are re-parsing our transport list, and we are going to remove * this one if we don't find it in the list of configured transports. */ unsigned marked_for_removal : 1; + /** Arguments for this transport that must be written to the + extra-info descriptor. */ + char *extra_info_args; } transport_t; void mark_transport_list(void); @@ -117,6 +120,9 @@ STATIC void managed_proxy_destroy(managed_proxy_t *mp, STATIC managed_proxy_t *managed_proxy_create(const smartlist_t *transport_list, char **proxy_argv, int is_server); +STATIC managed_proxy_t *managed_proxy_create(const smartlist_t *transport_list, + char **proxy_argv, int is_server); + #endif #endif |