diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-12-07 11:02:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-12-07 11:02:10 -0500 |
| commit | eeac53734354e5f0e5ff4ab6cf1e48a6d06cdc8e (patch) | |
| tree | 721fead9617c186ba8fab6e4605d3d18a63cdc1b /proposals/001-process.txt | |
| parent | 7f744603c3adc649fcc56d84f84f2005427e7429 (diff) | |
| parent | 5d96921aae11ca4716b11bc4b478ac3bc5ab0e11 (diff) | |
| download | torspec-eeac53734354e5f0e5ff4ab6cf1e48a6d06cdc8e.tar.gz torspec-eeac53734354e5f0e5ff4ab6cf1e48a6d06cdc8e.zip | |
Merge branch 'isolated-streams'
Conflicts:
doc/spec/proposals/000-index.txt
Diffstat (limited to 'proposals/001-process.txt')
| -rw-r--r-- | proposals/001-process.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/proposals/001-process.txt b/proposals/001-process.txt index e2fe358..53ad32b 100644 --- a/proposals/001-process.txt +++ b/proposals/001-process.txt @@ -75,7 +75,7 @@ How new proposals get added: To get your proposal in, send it to or-dev. - The current proposal editor is Nick Mathewson. + The current proposal editors are Nick Mathewson and Jacob Appelbaum. What should go in a proposal: |