Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	src/or/circuitbuild.h

diff --cc src/or/circuitbuild.c
Simple merge

diff --cc src/or/circuitbuild.h
index 33d483df8751309d3c0ec8c54217d9251cd740d1,0e673e1c05354bc351da543ea0aa6c6dc6d284f1..87adb9a1e8162c5e4d7240953a14a299664eecd6
--- 1/src/or/circuitbuild.h
--- 2/src/or/circuitbuild.h
+++ b/src/or/circuitbuild.h
@@@ -63,12 -62,13 +63,13 @@@ int getinfo_helper_entry_guards(control
                                  const char *question, char **answer,
                                  const char **errmsg);
  
- void clear_bridge_list(void);
+ void mark_bridge_list(void);
+ void sweep_bridge_list(void);
 -int routerinfo_is_a_configured_bridge(routerinfo_t *ri);
 +int routerinfo_is_a_configured_bridge(const routerinfo_t *ri);
- void learned_router_identity(tor_addr_t *addr, uint16_t port,
+ void learned_router_identity(const tor_addr_t *addr, uint16_t port,
                               const char *digest);
  void bridge_add_from_config(const tor_addr_t *addr, uint16_t port,
-                             char *digest);
+                             const char *digest);
  void retry_bridge_descriptor_fetch_directly(const char *digest);
  void fetch_bridge_descriptors(or_options_t *options, time_t now);
  void learned_bridge_descriptor(routerinfo_t *ri, int from_cache);

diff --cc src/or/config.c
Simple merge