diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-02 13:05:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-02 13:05:00 -0400 |
| commit | 6a320b99058ff19a2b71425e7cd6f267798411be (patch) | |
| tree | bef9e37cd3f291c8cb873acf6b96294266c8c7c3 /tor.spec.in | |
| parent | 0a4a3de3def27a7c7f8a514546b33662d0cfe6c5 (diff) | |
| parent | 385c59798af80e2609b66afb2998acb508060f95 (diff) | |
| download | tor-6a320b99058ff19a2b71425e7cd6f267798411be.tar.gz tor-6a320b99058ff19a2b71425e7cd6f267798411be.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
This merge was a bit nontrivial, since I had to write a new
node_is_a_configured_bridge to parallel router_is_a_configured_bridge.
Conflicts:
src/or/circuitbuild.c
Diffstat (limited to 'tor.spec.in')
0 files changed, 0 insertions, 0 deletions