[tor-bugs] #9349 [Flashproxy]: flashproxy facilitator: Allow clients to specify transports
Tor Bug Tracker & Wiki
blackhole at torproject.org
Thu Oct 10 08:35:43 UTC 2013
#9349: flashproxy facilitator: Allow clients to specify transports
----------------------------+--------------------------
Reporter: asn | Owner: dcf
Type: task | Status: needs_review
Priority: normal | Milestone:
Component: Flashproxy | Version:
Resolution: | Keywords:
Actual Points: | Parent ID: #7167
Points: |
----------------------------+--------------------------
Comment (by infinity0):
Seems good for now, in that it probably won't conflict with my other
branches. What is currently deployed in siteb is my `merge-all` branch on
github that also pulls in `common-sub` (#6810) and `fac-build` (#9668),
and I can probably merge this client code too if I first revert `c3029c9`.
I am also using `git rerere`, and can send over the resolution state files
if anyone wants to try it out themselves. However it's not perfect and you
still need to resolve the conflict in facilitator-howto.txt by hand, which
just involves copying the "security setup" section from doc/facilitator-
howto.txt (unfortunately detected as "deleted" from `fac-build`) into the
relevant place in facilitator/doc/facilitator-howto.txt.
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/9349#comment:42>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
More information about the tor-bugs
mailing list