 Nick Mathewson
|
705d3b221e
Merge branch 'incoming_queue_symbol_fix'
|
8 years ago |
|
Nick Mathewson
|
4b3e6c4d43
Merge branch 'maint-0.2.8'
|
8 years ago |
|
Nick Mathewson
|
fdb57db581
Merge branch 'bug18133_027' into maint-0.2.8
|
8 years ago |
|
Nick Mathewson
|
4093f343ca
fix indentation
|
8 years ago |
|
Nick Mathewson
|
9e57ffa520
Merge branch 'maint-0.2.8'
|
8 years ago |
|
Nick Mathewson
|
e247093e0e
Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8
|
8 years ago |
 Andrea Shepard
|
183d465f0e
Merge branch 'bug15221_027' into maint-0.2.7
|
8 years ago |
|
Nick Mathewson
|
beba70ec77
Don't declare "incoming_queue" in every file including channel.h
|
8 years ago |
|
Andrea Shepard
|
0b45cab147
Merge branch 'bug18570_027' into maint-0.2.7
|
8 years ago |
 Roger Dingledine
|
93c311daa8
majority of four is, alas, three
|
8 years ago |
|
Roger Dingledine
|
1103d82492
fix typo in comment
|
8 years ago |
|
Andrea Shepard
|
1218d731d1
Merge branch 'bug16248_027' into maint-0.2.7
|
8 years ago |
|
Nick Mathewson
|
4e76b206b5
Merge remote-tracking branch 'arma/feature18624'
|
8 years ago |
|
Nick Mathewson
|
e1f4d9552e
Faravahar also versions.
|
8 years ago |
|
Nick Mathewson
|
90c24c0ced
Merge branch 'maint-0.2.8'
|
8 years ago |
|
Nick Mathewson
|
ba87f5bb25
Fix my dumb unreleased bug in 18673
|
8 years ago |
|
Nick Mathewson
|
055a7a198a
Rename tor_dup_addr to tor_addr_to_str_dup.
|
8 years ago |
|
Nick Mathewson
|
3220bd816b
Merge branch 'maint-0.2.8'
|
8 years ago |
|
Nick Mathewson
|
f780d196a9
Merge branch 'bug18673_028_v2' into maint-0.2.8
|
8 years ago |
|
Nick Mathewson
|
79e534859b
Merge remote-tracking branch 'sebastian/onlyonly' into maint-0.2.8
|
8 years ago |
|
Nick Mathewson
|
c8eb39d67f
Remove a couple of redundant lines from the makefile
|
8 years ago |
|
Nick Mathewson
|
1275d92399
Merge branch 'reldoc'
|
8 years ago |
|
Nick Mathewson
|
05b52eea6a
Add more structure (and tests) to ReleasingTor.md
|
8 years ago |
|
Nick Mathewson
|
447b1c6b1d
Begin an 0.2.9 branch
|
8 years ago |
|
Nick Mathewson
|
a3f36bfd81
and NOW the version is 0.2.8.2-alpha-dev
|
8 years ago |
|
Nick Mathewson
|
684babee84
rewrap changelog
|
8 years ago |
|
Roger Dingledine
|
a1cc966685
minor changelog cleanups to help the new alpha
|
8 years ago |
|
Nick Mathewson
|
2eb2269f8c
changelog fixes from arma
|
8 years ago |
|
Nick Mathewson
|
5b12642d09
Bump version correctly this time
|
8 years ago |
|
Nick Mathewson
|
a0f0e43c87
typo fix
|
8 years ago |
